aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2015-09-23 00:00:30 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2015-09-23 00:00:30 -0400
commit7488ea8c14563caac2655973a7b4c158d16f25b4 (patch)
treefe733bb5eb92ad79be7f689539b4cf10952ae203
parent1ae288b0b353d2c00b3ba3fd93cae54ed673c634 (diff)
update video probing
-rw-r--r--MediaBrowser.Providers/Manager/ProviderManager.cs2
-rw-r--r--MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs5
2 files changed, 3 insertions, 4 deletions
diff --git a/MediaBrowser.Providers/Manager/ProviderManager.cs b/MediaBrowser.Providers/Manager/ProviderManager.cs
index 80264d848..6f3c1bb50 100644
--- a/MediaBrowser.Providers/Manager/ProviderManager.cs
+++ b/MediaBrowser.Providers/Manager/ProviderManager.cs
@@ -495,8 +495,6 @@ namespace MediaBrowser.Providers.Manager
ParentId = Guid.NewGuid()
};
- dummy.SetParent(new Folder());
-
var options = GetMetadataOptions(dummy);
var summary = new MetadataPluginSummary
diff --git a/MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs b/MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs
index 671f12c1b..05756bba2 100644
--- a/MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs
+++ b/MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs
@@ -488,7 +488,8 @@ namespace MediaBrowser.Providers.MediaInfo
{
var subtitleResolver = new SubtitleResolver(_localization, _fileSystem);
- var externalSubtitleStreams = subtitleResolver.GetExternalSubtitleStreams(video, currentStreams.Count, options.DirectoryService, false).ToList();
+ var startIndex = currentStreams.Count == 0 ? 0 : (currentStreams.Select(i => i.Index).Max() + 1);
+ var externalSubtitleStreams = subtitleResolver.GetExternalSubtitleStreams(video, startIndex, options.DirectoryService, false).ToList();
var enableSubtitleDownloading = options.MetadataRefreshMode == MetadataRefreshMode.Default ||
options.MetadataRefreshMode == MetadataRefreshMode.FullRefresh;
@@ -512,7 +513,7 @@ namespace MediaBrowser.Providers.MediaInfo
// Rescan
if (downloadedLanguages.Count > 0)
{
- externalSubtitleStreams = subtitleResolver.GetExternalSubtitleStreams(video, currentStreams.Count, options.DirectoryService, true).ToList();
+ externalSubtitleStreams = subtitleResolver.GetExternalSubtitleStreams(video, startIndex, options.DirectoryService, true).ToList();
}
}