alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-04-26 12:05:04 +01:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

updated ImageMagickSharp

Browse Source
This commit is contained in:
Luke Pulverenti
2015-04-23 22:15:29 -04:00
parent 6f01652520
commit db66b73a4f
14 changed files with 56 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
MediaBrowser.Server.Implementations/Configuration/ServerConfigurationManager.cs
View File

@@ -101,9 +101,22 @@ namespace MediaBrowser.Server.Implementations.Configuration
/// </summary>
private void UpdateMetadataPath()
{
((ServerApplicationPaths)ApplicationPaths).InternalMetadataPath = string.IsNullOrEmpty(Configuration.MetadataPath) ?
GetInternalMetadataPath() :
Configuration.MetadataPath;
string metadataPath;
if (string.IsNullOrWhiteSpace(Configuration.MetadataPath))
{
metadataPath = GetInternalMetadataPath();
}
else if (Configuration.EnableCustomPathSubFolders)
{
metadataPath = Path.Combine(Configuration.MetadataPath, "metadata");
}
else
{
metadataPath = Configuration.MetadataPath;
}
((ServerApplicationPaths)ApplicationPaths).InternalMetadataPath = metadataPath;
if (Configuration.MergeMetadataAndImagesByName)
{
@@ -130,7 +143,7 @@ namespace MediaBrowser.Server.Implementations.Configuration
((ServerApplicationPaths)ApplicationPaths).TranscodingTempPath = string.IsNullOrEmpty(encodingConfig.TranscodingTempPath) ?
null :
encodingConfig.TranscodingTempPath;
Path.Combine(encodingConfig.TranscodingTempPath, "transcoding-temp");
}
protected override void OnNamedConfigurationUpdated(string key, object configuration)

18
MediaBrowser.Server.Implementations/Sync/CloudSyncProfile.cs
View File

@@ -1,5 +1,5 @@
using System.Collections.Generic;
using MediaBrowser.Model.Dlna;
using MediaBrowser.Model.Dlna;
using System.Collections.Generic;
namespace MediaBrowser.Server.Implementations.Sync
{
@@ -31,13 +31,13 @@ namespace MediaBrowser.Server.Implementations.Sync
DirectPlayProfiles = new[]
{
new DirectPlayProfile
{
Container = "mkv",
VideoCodec = "h264,mpeg4",
AudioCodec = mkvAudio,
Type = DlnaProfileType.Video
},
//new DirectPlayProfile
//{
// Container = "mkv",
// VideoCodec = "h264,mpeg4",
// AudioCodec = mkvAudio,
// Type = DlnaProfileType.Video
//},
new DirectPlayProfile
{
Container = "mp4,mov,m4v",