1 files changed, 16 insertions, 37 deletions
diff --git a/MediaBrowser.Server.Implementations/Dto/DtoService.cs b/MediaBrowser.Server.Implementations/Dto/DtoService.cs
index a43c51282..6a0723c52 100644
--- a/MediaBrowser.Server.Implementations/Dto/DtoService.cs
+++ b/MediaBrowser.Server.Implementations/Dto/DtoService.cs
@@ -103,6 +103,22 @@ namespace MediaBrowser.Server.Implementations.Dto
                 AttachUserSpecificInfo(dto, item, user, fields);
             }
 
+            var hasMediaSources = item as IHasMediaSources;
+            if (hasMediaSources != null)
+            {
+                if (fields.Contains(ItemFields.MediaSources))
+                {
+                    if (user == null)
+                    {
+                        dto.MediaSources = hasMediaSources.GetMediaSources(true).ToList();
+                    }
+                    else
+                    {
+                        dto.MediaSources = hasMediaSources.GetMediaSources(true, user).ToList();
+                    }
+                }
+            }
+
             if (fields.Contains(ItemFields.Studios))
             {
                 AttachStudios(dto, item);
@@ -110,33 +126,6 @@ namespace MediaBrowser.Server.Implementations.Dto
 
             AttachBasicFields(dto, item, owner, fields);
 
-            if (user != null && dto.MediaSources != null && item is Video)
-            {
-                var preferredAudio = string.IsNullOrEmpty(user.Configuration.AudioLanguagePreference)
-                    ? new string[] { }
-                    : new[] { user.Configuration.AudioLanguagePreference };
-
-                var preferredSubs = string.IsNullOrEmpty(user.Configuration.SubtitleLanguagePreference)
-                    ? new string[] { }
-                    : new[] { user.Configuration.SubtitleLanguagePreference };
-
-                foreach (var source in dto.MediaSources)
-                {
-                    source.DefaultAudioStreamIndex = MediaStreamSelector.GetDefaultAudioStreamIndex(
-                        source.MediaStreams, preferredAudio, user.Configuration.PlayDefaultAudioTrack);
-
-                    var defaultAudioIndex = source.DefaultAudioStreamIndex;
-                    var audioLangage = defaultAudioIndex == null
-                        ? null
-                        : source.MediaStreams.Where(i => i.Type == MediaStreamType.Audio && i.Index == defaultAudioIndex).Select(i => i.Language).FirstOrDefault();
-
-                    source.DefaultSubtitleStreamIndex = MediaStreamSelector.GetDefaultSubtitleStreamIndex(source.MediaStreams, 
-                        preferredSubs,
-                        user.Configuration.SubtitleMode, 
-                        audioLangage);
-                }
-            }
-
             if (fields.Contains(ItemFields.SoundtrackIds))
             {
                 var hasSoundtracks = item as IHasSoundtracks;
@@ -926,11 +915,6 @@ namespace MediaBrowser.Server.Implementations.Dto
                 }
 
                 dto.MediaSourceCount = 1;
-
-                if (fields.Contains(ItemFields.MediaSources))
-                {
-                    dto.MediaSources = GetMediaSources(audio);
-                }
             }
 
             var album = item as MusicAlbum;
@@ -963,11 +947,6 @@ namespace MediaBrowser.Server.Implementations.Dto
                 dto.PartCount = video.AdditionalPartIds.Count + 1;
                 dto.MediaSourceCount = video.MediaSourceCount;
 
-                if (fields.Contains(ItemFields.MediaSources))
-                {
-                    dto.MediaSources = GetMediaSources(video);
-                }
-
                 if (fields.Contains(ItemFields.Chapters))
                 {
                     List<ChapterInfoDto> chapters;