From 8cce9d5f6f6b35e2f89c6238f804bd908832b4f3 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Wed, 13 Jul 2016 15:09:31 -0400
Subject: [PATCH] add all subtitles to hls manifest

---
 MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs | 2 +-
 MediaBrowser.Api/Playback/StreamRequest.cs         | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs b/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs
index 8ea279f1a3..36ab20f0fe 100644
--- a/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs
+++ b/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs
@@ -525,7 +525,7 @@ namespace MediaBrowser.Api.Playback.Hls
 
             var subtitleGroup = subtitleStreams.Count > 0 &&
                 request is GetMasterHlsVideoPlaylist &&
-                ((GetMasterHlsVideoPlaylist)request).SubtitleMethod == SubtitleDeliveryMethod.Hls ?
+                (((GetMasterHlsVideoPlaylist)request).SubtitleMethod == SubtitleDeliveryMethod.Hls || ((GetMasterHlsVideoPlaylist)request).EnableSubtitlesInManifest) ?
                 "subs" :
                 null;
 
diff --git a/MediaBrowser.Api/Playback/StreamRequest.cs b/MediaBrowser.Api/Playback/StreamRequest.cs
index 370915ec38..a8ca6aaa3b 100644
--- a/MediaBrowser.Api/Playback/StreamRequest.cs
+++ b/MediaBrowser.Api/Playback/StreamRequest.cs
@@ -194,6 +194,8 @@ namespace MediaBrowser.Api.Playback
 
         public bool ForceLiveStream { get; set; }
 
+        public bool EnableSubtitlesInManifest { get; set; }
+
         public VideoStreamRequest()
         {
             EnableAutoStreamCopy = true;