aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke <luke.pulverenti@gmail.com>2016-07-13 14:13:02 -0400
committerGitHub <noreply@github.com>2016-07-13 14:13:02 -0400
commit9b4eade7c75d7d7d446c26f8b6fc9ca9512e7b41 (patch)
tree5ef88e7aa2de04e75d4261faf92b49e1ac28834c
parent4f6a3138a65e4dbe356acec36f0f51de74486737 (diff)
parent5bd44644cc0d9f4751fb371b95f18c4d1e6f4965 (diff)
Merge pull request #1939 from MediaBrowser/dev
update hls subtitle display name
-rw-r--r--MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs4
1 files changed, 1 insertions, 3 deletions
diff --git a/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs b/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs
index 780e20f87..8ea279f1a 100644
--- a/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs
+++ b/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs
@@ -572,13 +572,11 @@ namespace MediaBrowser.Api.Playback.Hls
{
const string format = "#EXT-X-MEDIA:TYPE=SUBTITLES,GROUP-ID=\"subs\",NAME=\"{0}\",DEFAULT={1},FORCED={2},AUTOSELECT=YES,URI=\"{3}\",LANGUAGE=\"{4}\"";
- var name = stream.Language;
+ var name = stream.DisplayTitle;
var isDefault = selectedIndex.HasValue && selectedIndex.Value == stream.Index;
var isForced = stream.IsForced;
- if (string.IsNullOrWhiteSpace(name)) name = stream.Codec ?? "Unknown";
-
var url = string.Format("{0}/Subtitles/{1}/subtitles.m3u8?SegmentLength={2}&api_key={3}",
state.Request.MediaSourceId,
stream.Index.ToString(UsCulture),