diff options
| author | Luke <luke.pulverenti@gmail.com> | 2015-11-30 13:05:36 -0500 |
|---|---|---|
| committer | Luke <luke.pulverenti@gmail.com> | 2015-11-30 13:05:36 -0500 |
| commit | 843c9886aa5fedd015d0873b8dcfe0dbb7aff80c (patch) | |
| tree | 85ad53b68bcb1c4de043c8f041caabd92a60ed33 | |
| parent | 44bb06313b3ea44dc5359fb75f16c0d52c6a68b4 (diff) | |
| parent | 882e5753d6a4e426e41c88077a4a7e1438bbd61f (diff) | |
Merge pull request #1294 from MediaBrowser/master
shorten hls urls
| -rw-r--r-- | MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs b/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs index 546b1ec5f..3724c8868 100644 --- a/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs +++ b/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs @@ -66,7 +66,7 @@ namespace MediaBrowser.Api.Playback.Hls { } - [Route("/Videos/{Id}/hlsdynamic/{PlaylistId}/{SegmentId}.ts", "GET")] + [Route("/Videos/{Id}/hls1/{PlaylistId}/{SegmentId}.ts", "GET")] [Api(Description = "Gets an Http live streaming segment file. Internal use only.")] public class GetHlsVideoSegment : VideoStreamRequest { @@ -79,8 +79,8 @@ namespace MediaBrowser.Api.Playback.Hls public string SegmentId { get; set; } } - [Route("/Audio/{Id}/hlsdynamic/{PlaylistId}/{SegmentId}.aac", "GET")] - [Route("/Audio/{Id}/hlsdynamic/{PlaylistId}/{SegmentId}.ts", "GET")] + [Route("/Audio/{Id}/hls1/{PlaylistId}/{SegmentId}.aac", "GET")] + [Route("/Audio/{Id}/hls1/{PlaylistId}/{SegmentId}.ts", "GET")] [Api(Description = "Gets an Http live streaming segment file. Internal use only.")] public class GetHlsAudioSegment : StreamRequest { @@ -725,7 +725,7 @@ namespace MediaBrowser.Api.Playback.Hls { builder.AppendLine("#EXTINF:" + length.ToString("0.0000", UsCulture) + ","); - builder.AppendLine(string.Format("hlsdynamic/{0}/{1}{2}{3}", + builder.AppendLine(string.Format("hls1/{0}/{1}{2}{3}", name, index.ToString(UsCulture), |