aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Model
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2016-03-07 13:50:58 -0500
committerLuke Pulverenti <luke.pulverenti@gmail.com>2016-03-07 13:50:58 -0500
commit9b8f85ea8138b3ec4435bcede6a1d72d27b09d73 (patch)
treec296aa4290904990160b36693af908b8fe825dcf /MediaBrowser.Model
parenta8296cba37357a476b279bccd8d085ce123c600a (diff)
update hls subtitles
Diffstat (limited to 'MediaBrowser.Model')
-rw-r--r--MediaBrowser.Model/Dlna/StreamBuilder.cs11
1 files changed, 5 insertions, 6 deletions
diff --git a/MediaBrowser.Model/Dlna/StreamBuilder.cs b/MediaBrowser.Model/Dlna/StreamBuilder.cs
index 665da030d..b04f1b0fb 100644
--- a/MediaBrowser.Model/Dlna/StreamBuilder.cs
+++ b/MediaBrowser.Model/Dlna/StreamBuilder.cs
@@ -783,6 +783,11 @@ namespace MediaBrowser.Model.Dlna
continue;
}
+ if (profile.Method == SubtitleDeliveryMethod.Hls && playMethod != PlayMethod.Transcode)
+ {
+ continue;
+ }
+
if (!profile.SupportsLanguage(subtitleStream.Language))
{
continue;
@@ -799,12 +804,6 @@ namespace MediaBrowser.Model.Dlna
{
return profile;
}
-
- // For sync we can handle the longer extraction times
- if (context == EncodingContext.Static && subtitleStream.IsTextSubtitleStream)
- {
- return profile;
- }
}
}
}