diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-05-07 16:24:34 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-05-07 16:24:34 -0400 |
| commit | c183edc2382bdbe8b8910f3d24568b95c01df109 (patch) | |
| tree | cea7150eb10fe04dc51c24c5998a103fe9e27490 /MediaBrowser.Providers | |
| parent | d5b1730a7ac493964083bfeb3785f0c7ab5bdf71 (diff) | |
rename subtitle config property
Diffstat (limited to 'MediaBrowser.Providers')
| -rw-r--r-- | MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.Providers/MediaInfo/SubtitleDownloader.cs | 12 |
2 files changed, 9 insertions, 5 deletions
diff --git a/MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs b/MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs index ad222aca5c..a78c27aa43 100644 --- a/MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs +++ b/MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs @@ -472,7 +472,7 @@ namespace MediaBrowser.Providers.MediaInfo .DownloadSubtitles(video, currentStreams, externalSubtitleStreams, - _config.Configuration.SubtitleOptions.RequireExternalSubtitles, + _config.Configuration.SubtitleOptions.RequireTextSubtitles, _config.Configuration.SubtitleOptions.DownloadLanguages, cancellationToken).ConfigureAwait(false); diff --git a/MediaBrowser.Providers/MediaInfo/SubtitleDownloader.cs b/MediaBrowser.Providers/MediaInfo/SubtitleDownloader.cs index 7f7ccda193..b9a23449a1 100644 --- a/MediaBrowser.Providers/MediaInfo/SubtitleDownloader.cs +++ b/MediaBrowser.Providers/MediaInfo/SubtitleDownloader.cs @@ -24,7 +24,7 @@ namespace MediaBrowser.Providers.MediaInfo } public async Task<List<string>> DownloadSubtitles(Video video, - List<MediaStream> internalSubtitleStreams, + List<MediaStream> internalMediaStreams, List<MediaStream> externalSubtitleStreams, bool forceExternal, IEnumerable<string> languages, @@ -58,7 +58,7 @@ namespace MediaBrowser.Providers.MediaInfo { try { - var downloaded = await DownloadSubtitles(video, internalSubtitleStreams, externalSubtitleStreams, forceExternal, lang, mediaType, cancellationToken) + var downloaded = await DownloadSubtitles(video, internalMediaStreams, externalSubtitleStreams, forceExternal, lang, mediaType, cancellationToken) .ConfigureAwait(false); if (downloaded) @@ -76,7 +76,7 @@ namespace MediaBrowser.Providers.MediaInfo } private async Task<bool> DownloadSubtitles(Video video, - IEnumerable<MediaStream> internalSubtitleStreams, + List<MediaStream> internalMediaStreams, IEnumerable<MediaStream> externalSubtitleStreams, bool forceExternal, string language, @@ -89,8 +89,12 @@ namespace MediaBrowser.Providers.MediaInfo return false; } + var internalAudioStreams = internalMediaStreams.Where(i => i.Type == MediaStreamType.Audio) + .ToList(); + // There's an internal subtitle stream for this language - if (!forceExternal && internalSubtitleStreams.Any(i => string.Equals(i.Language, language, StringComparison.OrdinalIgnoreCase))) + if (!forceExternal && + internalMediaStreams.Any(i => i.Type == MediaStreamType.Subtitle && string.Equals(i.Language, language, StringComparison.OrdinalIgnoreCase))) { return false; } |
