diff options
4 files changed, 20 insertions, 10 deletions
diff --git a/MediaBrowser.Api/Playback/BaseStreamingService.cs b/MediaBrowser.Api/Playback/BaseStreamingService.cs index 034f5c56b..d959d9e77 100644 --- a/MediaBrowser.Api/Playback/BaseStreamingService.cs +++ b/MediaBrowser.Api/Playback/BaseStreamingService.cs @@ -798,7 +798,7 @@ namespace MediaBrowser.Api.Playback { get { - return false; + return true; } } diff --git a/MediaBrowser.Dlna/Profiles/SamsungSmartTvProfile.cs b/MediaBrowser.Dlna/Profiles/SamsungSmartTvProfile.cs index 1499d0e74..970995b7d 100644 --- a/MediaBrowser.Dlna/Profiles/SamsungSmartTvProfile.cs +++ b/MediaBrowser.Dlna/Profiles/SamsungSmartTvProfile.cs @@ -336,6 +336,13 @@ namespace MediaBrowser.Dlna.Profiles Container = "mkv", MimeType = "video/x-mkv", Type = DlnaProfileType.Video + }, + + new ResponseProfile + { + Container = "flac", + MimeType = "audio/x-flac", + Type = DlnaProfileType.Audio } }; diff --git a/MediaBrowser.Dlna/Profiles/Xml/Samsung Smart TV.xml b/MediaBrowser.Dlna/Profiles/Xml/Samsung Smart TV.xml index 27d8e00ec..d2b814de3 100644 --- a/MediaBrowser.Dlna/Profiles/Xml/Samsung Smart TV.xml +++ b/MediaBrowser.Dlna/Profiles/Xml/Samsung Smart TV.xml @@ -110,6 +110,9 @@ <ResponseProfile container="mkv" type="Video" mimeType="video/x-mkv"> <Conditions /> </ResponseProfile> + <ResponseProfile container="flac" type="Audio" mimeType="audio/x-flac"> + <Conditions /> + </ResponseProfile> </ResponseProfiles> <SubtitleProfiles> <SubtitleProfile format="srt" method="External" didlMode="CaptionInfoEx" /> diff --git a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs index 4f8b6c6ac..24b818f5a 100644 --- a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs +++ b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs @@ -700,17 +700,17 @@ namespace MediaBrowser.MediaEncoding.Subtitles /// <returns>System.String.</returns> public string GetSubtitleFileCharacterSet(string path, string language) { - //var charset = DetectCharset(path); + var charset = DetectCharset(path); - //if (!string.IsNullOrWhiteSpace(charset)) - //{ - // if (string.Equals(charset, "utf-8", StringComparison.OrdinalIgnoreCase)) - // { - // return null; - // } + if (!string.IsNullOrWhiteSpace(charset)) + { + if (string.Equals(charset, "utf-8", StringComparison.OrdinalIgnoreCase)) + { + return null; + } - // return charset; - //} + return charset; + } if (GetFileEncoding(path).Equals(Encoding.UTF8)) { |