Merging in latest dev

1 files changed, 4 insertions, 3 deletions

diff --git a/MediaBrowser.Server.Implementations/Sync/SyncJobProcessor.cs b/MediaBrowser.Server.Implementations/Sync/SyncJobProcessor.cs
index 22c59610b..271b2bb39 100644
--- a/MediaBrowser.Server.Implementations/Sync/SyncJobProcessor.cs
+++ b/MediaBrowser.Server.Implementations/Sync/SyncJobProcessor.cs
@@ -495,7 +495,7 @@ namespace MediaBrowser.Server.Implementations.Sync
             // No sense creating external subs if we're already burning one into the video
             var externalSubs = streamInfo.SubtitleDeliveryMethod == SubtitleDeliveryMethod.Encode ?
                 new List<SubtitleStreamInfo>() :
-                streamInfo.GetExternalSubtitles(false);
+                streamInfo.GetExternalSubtitles(false, true, null, null);
 
             // Mark as requiring conversion if transcoding the video, or if any subtitles need to be extracted
             var requiresVideoTranscoding = streamInfo.PlayMethod == PlayMethod.Transcode && jobOptions.IsConverting;
@@ -632,7 +632,8 @@ namespace MediaBrowser.Server.Implementations.Sync
                     IsExternal = true,
                     Language = subtitle.Language,
                     Path = fileInfo.Path,
-                    SupportsExternalStream = true
+                    SupportsExternalStream = true,
+                    Type = MediaStreamType.Subtitle
                 });
 
                 startingIndex++;
@@ -822,7 +823,7 @@ namespace MediaBrowser.Server.Implementations.Sync
 
             var hasMediaSources = item as IHasMediaSources;
 
-            var mediaSources = hasMediaSources.GetMediaSources(false).ToList();
+            var mediaSources = _mediaSourceManager.GetStaticMediaSources(hasMediaSources, false).ToList();
 
             var preferredAudio = string.IsNullOrEmpty(user.Configuration.AudioLanguagePreference)
                 ? new string[] { }