From dd715fbcc74b6c69b5bcd68ea974e39df055c057 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Thu, 13 Apr 2017 14:57:24 -0400 Subject: [PATCH 1/3] use alameda --- .../Library/LibraryManager.cs | 22 ++++++++++++++----- .../Api/PackageCreator.cs | 4 +--- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/Emby.Server.Implementations/Library/LibraryManager.cs b/Emby.Server.Implementations/Library/LibraryManager.cs index dbb0160a53..fc2299907a 100644 --- a/Emby.Server.Implementations/Library/LibraryManager.cs +++ b/Emby.Server.Implementations/Library/LibraryManager.cs @@ -41,6 +41,7 @@ using SortOrder = MediaBrowser.Model.Entities.SortOrder; using VideoResolver = MediaBrowser.Naming.Video.VideoResolver; using MediaBrowser.Common.Configuration; using MediaBrowser.Common.IO; +using MediaBrowser.Controller.LiveTv; using MediaBrowser.Model.Tasks; namespace Emby.Server.Implementations.Library @@ -375,11 +376,22 @@ namespace Emby.Server.Implementations.Library throw new ArgumentNullException("item"); } - _logger.Debug("Deleting item, Type: {0}, Name: {1}, Path: {2}, Id: {3}", - item.GetType().Name, - item.Name ?? "Unknown name", - item.Path ?? string.Empty, - item.Id); + if (item is LiveTvProgram) + { + _logger.Debug("Deleting item, Type: {0}, Name: {1}, Path: {2}, Id: {3}", + item.GetType().Name, + item.Name ?? "Unknown name", + item.Path ?? string.Empty, + item.Id); + } + else + { + _logger.Info("Deleting item, Type: {0}, Name: {1}, Path: {2}, Id: {3}", + item.GetType().Name, + item.Name ?? "Unknown name", + item.Path ?? string.Empty, + item.Id); + } var parent = item.Parent; diff --git a/MediaBrowser.WebDashboard/Api/PackageCreator.cs b/MediaBrowser.WebDashboard/Api/PackageCreator.cs index f124b6e4ba..8880441e29 100644 --- a/MediaBrowser.WebDashboard/Api/PackageCreator.cs +++ b/MediaBrowser.WebDashboard/Api/PackageCreator.cs @@ -280,9 +280,7 @@ namespace MediaBrowser.WebDashboard.Api var files = new List(); - files.Add("bower_components/requirejs/require.js" + versionString); - - files.Add("scripts/site.js" + versionString); + files.Add("scripts/apploader.js" + versionString); if (string.Equals(mode, "cordova", StringComparison.OrdinalIgnoreCase)) { From 4fa90701fd73b811538947a844427d06afa71f6e Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Thu, 13 Apr 2017 14:57:57 -0400 Subject: [PATCH 2/3] fix incorrect level on encoding command line --- MediaBrowser.Controller/Entities/Video.cs | 2 +- MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/MediaBrowser.Controller/Entities/Video.cs b/MediaBrowser.Controller/Entities/Video.cs index 8906264191..0618fc489e 100644 --- a/MediaBrowser.Controller/Entities/Video.cs +++ b/MediaBrowser.Controller/Entities/Video.cs @@ -484,7 +484,7 @@ namespace MediaBrowser.Controller.Entities return new[] { new FileSystemMetadata { - FullName = System.IO.Path.GetDirectoryName(Path), + FullName = ContainingFolderPath, IsDirectory = true } }; diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs index 78e54289ea..8412985bfa 100644 --- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs +++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs @@ -719,8 +719,8 @@ namespace MediaBrowser.Controller.MediaEncoding } } // nvenc doesn't decode with param -level set ?! - if (string.Equals(videoEncoder, "h264_nvenc", StringComparison.OrdinalIgnoreCase)){ - param += ""; + else if (string.Equals(videoEncoder, "h264_nvenc", StringComparison.OrdinalIgnoreCase)){ + //param += ""; } else if (!string.Equals(videoEncoder, "h264_omx", StringComparison.OrdinalIgnoreCase)) { @@ -1606,6 +1606,11 @@ namespace MediaBrowser.Controller.MediaEncoding } } + if (state.MediaSource.RequiresLooping) + { + inputModifier += " -stream_loop -1"; + } + return inputModifier; } From 508edad222d46a7cee80c2eda68494e4f701cfec Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Thu, 13 Apr 2017 14:59:46 -0400 Subject: [PATCH 3/3] 3.2.12.5 --- Emby.Server.Implementations/LiveTv/TunerHosts/M3UTunerHost.cs | 1 + MediaBrowser.Model/Dto/MediaSourceInfo.cs | 2 ++ SharedVersion.cs | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Emby.Server.Implementations/LiveTv/TunerHosts/M3UTunerHost.cs b/Emby.Server.Implementations/LiveTv/TunerHosts/M3UTunerHost.cs index 4ec70f8026..8cf1106f0f 100644 --- a/Emby.Server.Implementations/LiveTv/TunerHosts/M3UTunerHost.cs +++ b/Emby.Server.Implementations/LiveTv/TunerHosts/M3UTunerHost.cs @@ -145,6 +145,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts }, RequiresOpening = true, RequiresClosing = true, + RequiresLooping = true, ReadAtNativeFramerate = false, diff --git a/MediaBrowser.Model/Dto/MediaSourceInfo.cs b/MediaBrowser.Model/Dto/MediaSourceInfo.cs index d416cfd96c..1315830247 100644 --- a/MediaBrowser.Model/Dto/MediaSourceInfo.cs +++ b/MediaBrowser.Model/Dto/MediaSourceInfo.cs @@ -40,6 +40,8 @@ namespace MediaBrowser.Model.Dto public string LiveStreamId { get; set; } public int? BufferMs { get; set; } + public bool RequiresLooping { get; set; } + public VideoType? VideoType { get; set; } public IsoType? IsoType { get; set; } diff --git a/SharedVersion.cs b/SharedVersion.cs index 68c72b079f..fdb5f7599f 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,3 +1,3 @@ using System.Reflection; -[assembly: AssemblyVersion("3.2.12.4")] +[assembly: AssemblyVersion("3.2.12.5")]