From ee0f95b56fd1fea8b8948223f85e791fb1b9d993 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Wed, 3 Apr 2013 15:53:34 -0400 Subject: [PATCH 1/4] added videojsextensions.js --- MediaBrowser.WebDashboard/Api/DashboardService.cs | 2 ++ MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj | 3 +++ 2 files changed, 5 insertions(+) diff --git a/MediaBrowser.WebDashboard/Api/DashboardService.cs b/MediaBrowser.WebDashboard/Api/DashboardService.cs index 3aab9c1c8e..68268ccced 100644 --- a/MediaBrowser.WebDashboard/Api/DashboardService.cs +++ b/MediaBrowser.WebDashboard/Api/DashboardService.cs @@ -454,7 +454,9 @@ namespace MediaBrowser.WebDashboard.Api { "extensions.js", "site.js", + "videojsextensions.js", "librarybrowser.js", + "aboutpage.js", "addpluginpage.js", "advancedconfigurationpage.js", diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj index d3c522fbf5..072f040128 100644 --- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj +++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj @@ -233,6 +233,9 @@ PreserveNewest + + PreserveNewest + PreserveNewest From 22a3ed0cd45554a512cc1f18187c5c630df219b9 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Wed, 3 Apr 2013 16:30:56 -0400 Subject: [PATCH 2/4] #72 - Subtitle path --- MediaBrowser.Api/Playback/BaseStreamingService.cs | 2 +- MediaBrowser.Api/Playback/Progressive/VideoService.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/MediaBrowser.Api/Playback/BaseStreamingService.cs b/MediaBrowser.Api/Playback/BaseStreamingService.cs index 6ec59c9de9..cbb98f0fe3 100644 --- a/MediaBrowser.Api/Playback/BaseStreamingService.cs +++ b/MediaBrowser.Api/Playback/BaseStreamingService.cs @@ -286,7 +286,7 @@ namespace MediaBrowser.Api.Playback return string.Empty; } - var param = string.Format(",ass={0}", path); + var param = string.Format(",ass={0}", path.Replace('\\', '/').Replace(":/", "\\:/")); if (startTimeTicks.HasValue) { diff --git a/MediaBrowser.Api/Playback/Progressive/VideoService.cs b/MediaBrowser.Api/Playback/Progressive/VideoService.cs index a6f78c0edf..14ad454193 100644 --- a/MediaBrowser.Api/Playback/Progressive/VideoService.cs +++ b/MediaBrowser.Api/Playback/Progressive/VideoService.cs @@ -35,7 +35,7 @@ namespace MediaBrowser.Api.Playback.Progressive [Route("/Videos/{Id}/stream.avi", "HEAD")] [Route("/Videos/{Id}/stream.m2ts", "HEAD")] [Route("/Videos/{Id}/stream", "HEAD")] - [ServiceStack.ServiceHost.Api(Description = "Gets a video stream")] + [Api(Description = "Gets a video stream")] public class GetVideoStream : VideoStreamRequest { From cab2e13ae2c668734e51c9bb78eab7947a537997 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Wed, 3 Apr 2013 18:45:04 -0400 Subject: [PATCH 3/4] adjusted tile text spacing --- MediaBrowser.Controller/Library/DtoBuilder.cs | 3 +-- MediaBrowser.Model/Entities/MediaStream.cs | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/MediaBrowser.Controller/Library/DtoBuilder.cs b/MediaBrowser.Controller/Library/DtoBuilder.cs index e87282c1fb..6b28e0347f 100644 --- a/MediaBrowser.Controller/Library/DtoBuilder.cs +++ b/MediaBrowser.Controller/Library/DtoBuilder.cs @@ -537,7 +537,6 @@ namespace MediaBrowser.Controller.Library /// /// The dto. /// The item. - /// The library manager. /// Task. private async Task AttachPeople(BaseItemDto dto, BaseItem item) { @@ -549,7 +548,7 @@ namespace MediaBrowser.Controller.Library // Attach People by transforming them into BaseItemPerson (DTO) dto.People = new BaseItemPerson[item.People.Count]; - var entities = await Task.WhenAll(item.People.Select(c => + var entities = await Task.WhenAll(item.People.OrderBy(i => i.Type).Select(c => Task.Run(async () => { diff --git a/MediaBrowser.Model/Entities/MediaStream.cs b/MediaBrowser.Model/Entities/MediaStream.cs index a17956c4d6..23744d644b 100644 --- a/MediaBrowser.Model/Entities/MediaStream.cs +++ b/MediaBrowser.Model/Entities/MediaStream.cs @@ -139,7 +139,7 @@ namespace MediaBrowser.Model.Entities /// /// The level. [ProtoMember(19)] - public double Level { get; set; } + public double? Level { get; set; } } /// From 8397b37827a50f770e4692952d345e851319dada Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Wed, 3 Apr 2013 18:46:32 -0400 Subject: [PATCH 4/4] updated nuget --- Nuget/MediaBrowser.Common.Internal.nuspec | 4 ++-- Nuget/MediaBrowser.Common.nuspec | 2 +- Nuget/MediaBrowser.Server.Core.nuspec | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Nuget/MediaBrowser.Common.Internal.nuspec b/Nuget/MediaBrowser.Common.Internal.nuspec index 7dc95c0f14..ba481fc678 100644 --- a/Nuget/MediaBrowser.Common.Internal.nuspec +++ b/Nuget/MediaBrowser.Common.Internal.nuspec @@ -2,7 +2,7 @@ MediaBrowser.Common.Internal - 3.0.63 + 3.0.64 MediaBrowser.Common.Internal Luke ebr,Luke,scottisafool @@ -12,7 +12,7 @@ Contains common components shared by Media Browser Theatre and Media Browser Server. Not intended for plugin developer consumption. Copyright © Media Browser 2013 - + diff --git a/Nuget/MediaBrowser.Common.nuspec b/Nuget/MediaBrowser.Common.nuspec index d8a39b5ffb..f2f25a02dd 100644 --- a/Nuget/MediaBrowser.Common.nuspec +++ b/Nuget/MediaBrowser.Common.nuspec @@ -2,7 +2,7 @@ MediaBrowser.Common - 3.0.63 + 3.0.64 MediaBrowser.Common Media Browser Team ebr,Luke,scottisafool diff --git a/Nuget/MediaBrowser.Server.Core.nuspec b/Nuget/MediaBrowser.Server.Core.nuspec index d050f63eb6..9b1f31365c 100644 --- a/Nuget/MediaBrowser.Server.Core.nuspec +++ b/Nuget/MediaBrowser.Server.Core.nuspec @@ -2,7 +2,7 @@ MediaBrowser.Server.Core - 3.0.63 + 3.0.64 Media Browser.Server.Core Media Browser Team ebr,Luke,scottisafool @@ -12,7 +12,7 @@ Contains core components required to build plugins for Media Browser Server. Copyright © Media Browser 2013 - +