michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2579 from MediaBrowser/dev

Browse Source 
Dev
This commit is contained in:
Luke 2017-04-13 15:00:48 -04:00 committed by GitHub
commit 072d2c63a5
7 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Emby.Server.Implementations/Library/LibraryManager.cs
View File

@ -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");
}
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;

1
Emby.Server.Implementations/LiveTv/TunerHosts/M3UTunerHost.cs
View File

@ -145,6 +145,7 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts
},
RequiresOpening = true,
RequiresClosing = true,
RequiresLooping = true,
ReadAtNativeFramerate = false,

2
MediaBrowser.Controller/Entities/Video.cs
View File

@ -484,7 +484,7 @@ namespace MediaBrowser.Controller.Entities
return new[] {
new FileSystemMetadata
{
FullName = System.IO.Path.GetDirectoryName(Path),
FullName = ContainingFolderPath,
IsDirectory = true
}
};

9
MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
View File

@ -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;
}

2
MediaBrowser.Model/Dto/MediaSourceInfo.cs
View File

@ -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; }

4
MediaBrowser.WebDashboard/Api/PackageCreator.cs
View File

@ -280,9 +280,7 @@ namespace MediaBrowser.WebDashboard.Api
var files = new List<string>();
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))
{

2
SharedVersion.cs
View File

@ -1,3 +1,3 @@
using System.Reflection;
[assembly: AssemblyVersion("3.2.12.4")]
[assembly: AssemblyVersion("3.2.12.5")]