Backupppert/jellyfin
0
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-09-06 19:37:55 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1294 from MediaBrowser/master

Browse source 
shorten hls urls
This commit is contained in:
Luke 2015-11-30 13:05:36 -05:00
commit 843c9886aa
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs
View file

@ -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.")] [Api(Description = "Gets an Http live streaming segment file. Internal use only.")]
public class GetHlsVideoSegment : VideoStreamRequest public class GetHlsVideoSegment : VideoStreamRequest
{ {
@ -79,8 +79,8 @@ namespace MediaBrowser.Api.Playback.Hls
public string SegmentId { get; set; } public string SegmentId { get; set; }
} }
[Route("/Audio/{Id}/hlsdynamic/{PlaylistId}/{SegmentId}.aac", "GET")] [Route("/Audio/{Id}/hls1/{PlaylistId}/{SegmentId}.aac", "GET")]
[Route("/Audio/{Id}/hlsdynamic/{PlaylistId}/{SegmentId}.ts", "GET")] [Route("/Audio/{Id}/hls1/{PlaylistId}/{SegmentId}.ts", "GET")]
[Api(Description = "Gets an Http live streaming segment file. Internal use only.")] [Api(Description = "Gets an Http live streaming segment file. Internal use only.")]
public class GetHlsAudioSegment : StreamRequest public class GetHlsAudioSegment : StreamRequest
{ {
@ -725,7 +725,7 @@ namespace MediaBrowser.Api.Playback.Hls
{ {
builder.AppendLine("#EXTINF:" + length.ToString("0.0000", UsCulture) + ","); 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, name,
index.ToString(UsCulture), index.ToString(UsCulture),