diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-10-05 12:05:08 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-10-05 12:05:08 -0400 |
| commit | e5fdf31ec43cf41ffc34fa69e328242dcc482975 (patch) | |
| tree | 1833fcb855a3cdd00eebe70b9c715b2b842fe2cd /MediaBrowser.Model | |
| parent | 26487dc455bf65f5232509aae5313bca092c5b6a (diff) | |
update subtitle transcoding
Diffstat (limited to 'MediaBrowser.Model')
| -rw-r--r-- | MediaBrowser.Model/Dlna/StreamBuilder.cs | 10 | ||||
| -rw-r--r-- | MediaBrowser.Model/Dlna/SubtitleProfile.cs | 13 |
2 files changed, 14 insertions, 9 deletions
diff --git a/MediaBrowser.Model/Dlna/StreamBuilder.cs b/MediaBrowser.Model/Dlna/StreamBuilder.cs index fb6864f15..e23cb8951 100644 --- a/MediaBrowser.Model/Dlna/StreamBuilder.cs +++ b/MediaBrowser.Model/Dlna/StreamBuilder.cs @@ -770,12 +770,12 @@ namespace MediaBrowser.Model.Dlna { return profile; } - } - // For sync we can handle the longer extraction times - if (context == EncodingContext.Static && subtitleStream.IsTextSubtitleStream) - { - return profile; + // For sync we can handle the longer extraction times + if (context == EncodingContext.Static && subtitleStream.IsTextSubtitleStream) + { + return profile; + } } } } diff --git a/MediaBrowser.Model/Dlna/SubtitleProfile.cs b/MediaBrowser.Model/Dlna/SubtitleProfile.cs index 1795c374a..0723de222 100644 --- a/MediaBrowser.Model/Dlna/SubtitleProfile.cs +++ b/MediaBrowser.Model/Dlna/SubtitleProfile.cs @@ -28,15 +28,20 @@ namespace MediaBrowser.Model.Dlna return list; } - public bool SupportsLanguage(string language) + public bool SupportsLanguage(string subLanguage) { - if (string.IsNullOrEmpty(language)) + if (string.IsNullOrEmpty(Language)) { - language = "und"; + return true; + } + + if (string.IsNullOrEmpty(subLanguage)) + { + subLanguage = "und"; } List<string> languages = GetLanguages(); - return languages.Count == 0 || ListHelper.ContainsIgnoreCase(languages, language); + return languages.Count == 0 || ListHelper.ContainsIgnoreCase(languages, subLanguage); } } }
\ No newline at end of file |