1 files changed, 49 insertions, 11 deletions
diff --git a/MediaBrowser.Server.Implementations/Library/MediaSourceManager.cs b/MediaBrowser.Server.Implementations/Library/MediaSourceManager.cs
index b132eedec..e4a085f42 100644
--- a/MediaBrowser.Server.Implementations/Library/MediaSourceManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/MediaSourceManager.cs
@@ -30,8 +30,9 @@ namespace MediaBrowser.Server.Implementations.Library
 
         private IMediaSourceProvider[] _providers;
         private readonly ILogger _logger;
+        private readonly IUserDataManager _userDataManager;
 
-        public MediaSourceManager(IItemRepository itemRepo, IUserManager userManager, ILibraryManager libraryManager, ILogger logger, IJsonSerializer jsonSerializer, IFileSystem fileSystem)
+        public MediaSourceManager(IItemRepository itemRepo, IUserManager userManager, ILibraryManager libraryManager, ILogger logger, IJsonSerializer jsonSerializer, IFileSystem fileSystem, IUserDataManager userDataManager)
         {
             _itemRepo = itemRepo;
             _userManager = userManager;
@@ -39,6 +40,7 @@ namespace MediaBrowser.Server.Implementations.Library
             _logger = logger;
             _jsonSerializer = jsonSerializer;
             _fileSystem = fileSystem;
+            _userDataManager = userDataManager;
         }
 
         public void AddParts(IEnumerable<IMediaSourceProvider> providers)
@@ -140,7 +142,7 @@ namespace MediaBrowser.Server.Implementations.Library
             {
                 if (user != null)
                 {
-                    SetUserProperties(source, user);
+                    SetUserProperties(hasMediaSources, source, user);
                 }
                 if (source.Protocol == MediaProtocol.File)
                 {
@@ -257,25 +259,38 @@ namespace MediaBrowser.Server.Implementations.Library
             {
                 foreach (var source in sources)
                 {
-                    SetUserProperties(source, user);
+                    SetUserProperties(item, source, user);
                 }
             }
 
             return sources;
         }
 
-        private void SetUserProperties(MediaSourceInfo source, User user)
+        private void SetUserProperties(IHasUserData item, MediaSourceInfo source, User user)
         {
-            var preferredAudio = string.IsNullOrEmpty(user.Configuration.AudioLanguagePreference)
-            ? new string[] { }
-            : new[] { user.Configuration.AudioLanguagePreference };
+            var userData = item == null ? new UserItemData() : _userDataManager.GetUserData(user.Id, item.GetUserDataKey());
+
+            SetDefaultAudioStreamIndex(source, userData, user);
+            SetDefaultSubtitleStreamIndex(source, userData, user);
+        }
 
+        private void SetDefaultSubtitleStreamIndex(MediaSourceInfo source, UserItemData userData, User user)
+        {
+            if (userData.SubtitleStreamIndex.HasValue && user.Configuration.RememberSubtitleSelections)
+            {
+                var index = userData.SubtitleStreamIndex.Value;
+                // Make sure the saved index is still valid
+                if (index == -1 || source.MediaStreams.Any(i => i.Type == MediaStreamType.Subtitle && i.Index == index))
+                {
+                    source.DefaultSubtitleStreamIndex = index;
+                    return;
+                }
+            }
+            
             var preferredSubs = string.IsNullOrEmpty(user.Configuration.SubtitleLanguagePreference)
                 ? new List<string> { }
                 : new List<string> { user.Configuration.SubtitleLanguagePreference };
 
-            source.DefaultAudioStreamIndex = MediaStreamSelector.GetDefaultAudioStreamIndex(source.MediaStreams, preferredAudio, user.Configuration.PlayDefaultAudioTrack);
-
             var defaultAudioIndex = source.DefaultAudioStreamIndex;
             var audioLangage = defaultAudioIndex == null
                 ? null
@@ -290,6 +305,26 @@ namespace MediaBrowser.Server.Implementations.Library
                 user.Configuration.SubtitleMode, audioLangage);
         }
 
+        private void SetDefaultAudioStreamIndex(MediaSourceInfo source, UserItemData userData, User user)
+        {
+            if (userData.AudioStreamIndex.HasValue && user.Configuration.RememberAudioSelections)
+            {
+                var index = userData.AudioStreamIndex.Value;
+                // Make sure the saved index is still valid
+                if (source.MediaStreams.Any(i => i.Type == MediaStreamType.Audio && i.Index == index))
+                {
+                    source.DefaultAudioStreamIndex = index;
+                    return;
+                }
+            }
+
+            var preferredAudio = string.IsNullOrEmpty(user.Configuration.AudioLanguagePreference)
+                ? new string[] { }
+                : new[] { user.Configuration.AudioLanguagePreference };
+
+            source.DefaultAudioStreamIndex = MediaStreamSelector.GetDefaultAudioStreamIndex(source.MediaStreams, preferredAudio, user.Configuration.PlayDefaultAudioTrack);
+        }
+
         private IEnumerable<MediaSourceInfo> SortMediaSources(IEnumerable<MediaSourceInfo> sources)
         {
             return sources.OrderBy(i =>
@@ -349,11 +384,14 @@ namespace MediaBrowser.Server.Implementations.Library
                 var json = _jsonSerializer.SerializeToString(mediaSource);
                 _logger.Debug("Live stream opened: " + json);
                 var clone = _jsonSerializer.DeserializeFromString<MediaSourceInfo>(json);
-
+               
                 if (!string.IsNullOrWhiteSpace(request.UserId))
                 {
                     var user = _userManager.GetUserById(request.UserId);
-                    SetUserProperties(clone, user);
+                    var item = string.IsNullOrWhiteSpace(request.ItemId)
+                        ? null
+                        : _libraryManager.GetItemById(request.ItemId);
+                    SetUserProperties(item, clone, user);
                 }
 
                 return new LiveStreamResponse