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

revert settings to their old names

Browse Source
This commit is contained in:
dkanada 2019-11-21 21:51:17 +09:00
parent b1f9b03b17
commit 37eed8cf1f
6 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Emby.Server.Implementations/ApplicationHost.cs
View File

@ -1447,7 +1447,7 @@ namespace Emby.Server.Implementations
CanSelfRestart = CanSelfRestart,
CanLaunchWebBrowser = CanLaunchWebBrowser,
HasUpdateAvailable = HasUpdateAvailable,
TranscodePath = ApplicationPaths.TranscodePath,
TranscodingTempPath = ApplicationPaths.TranscodePath,
ServerName = FriendlyName,
LocalAddress = localAddress,
SupportsLibraryMonitor = true,

4
Emby.Server.Implementations/Configuration/ServerConfigurationManager.cs
View File

@ -91,9 +91,9 @@ namespace Emby.Server.Implementations.Configuration
{
var encodingConfig = this.GetConfiguration<EncodingOptions>("encoding");
((ServerApplicationPaths)ApplicationPaths).TranscodePath = string.IsNullOrEmpty(encodingConfig.TranscodePath) ?
((ServerApplicationPaths)ApplicationPaths).TranscodePath = string.IsNullOrEmpty(encodingConfig.TranscodingTempPath) ?
null :
Path.Combine(encodingConfig.TranscodePath, "transcodes");
Path.Combine(encodingConfig.TranscodingTempPath, "transcodes");
}
protected override void OnNamedConfigurationUpdated(string key, object configuration)

13
Emby.Server.Implementations/EntryPoints/LibraryChangedNotifier.cs
View File

@ -21,7 +21,7 @@ namespace Emby.Server.Implementations.EntryPoints
public class LibraryChangedNotifier : IServerEntryPoint
{
/// <summary>
/// The _library manager
/// The library manager.
/// </summary>
private readonly ILibraryManager _libraryManager;
@ -30,7 +30,7 @@ namespace Emby.Server.Implementations.EntryPoints
private readonly ILogger _logger;
/// <summary>
/// The _library changed sync lock
/// The library changed sync lock.
/// </summary>
private readonly object _libraryChangedSyncLock = new object();
@ -48,7 +48,7 @@ namespace Emby.Server.Implementations.EntryPoints
private Timer LibraryUpdateTimer { get; set; }
/// <summary>
/// The library update duration
/// The library update duration.
/// </summary>
private const int LibraryUpdateDuration = 30000;
@ -188,8 +188,11 @@ namespace Emby.Server.Implementations.EntryPoints
{
if (LibraryUpdateTimer == null)
{
LibraryUpdateTimer = new Timer(LibraryUpdateTimerCallback, null, LibraryUpdateDuration,
Timeout.Infinite);
LibraryUpdateTimer = new Timer(
LibraryUpdateTimerCallback,
null,
LibraryUpdateDuration,
Timeout.Infinite);
}
else
{

4
MediaBrowser.MediaEncoding/Configuration/EncodingConfigurationFactory.cs
View File

@ -40,10 +40,10 @@ namespace MediaBrowser.MediaEncoding.Configuration
var oldEncodingConfig = (EncodingOptions)oldConfig;
var newEncodingConfig = (EncodingOptions)newConfig;
var newPath = newEncodingConfig.TranscodePath;
var newPath = newEncodingConfig.TranscodingTempPath;
if (!string.IsNullOrWhiteSpace(newPath)
&& !string.Equals(oldEncodingConfig.TranscodePath ?? string.Empty, newPath))
&& !string.Equals(oldEncodingConfig.TranscodingTempPath ?? string.Empty, newPath))
{
// Validate
if (!Directory.Exists(newPath))

2
MediaBrowser.Model/Configuration/EncodingOptions.cs
View File

@ -3,7 +3,7 @@ namespace MediaBrowser.Model.Configuration
public class EncodingOptions
{
public int EncodingThreadCount { get; set; }
public string TranscodePath { get; set; }
public string TranscodingTempPath { get; set; }
public double DownMixAudioBoost { get; set; }
public bool EnableThrottling { get; set; }
public int ThrottleDelaySeconds { get; set; }

6
MediaBrowser.Model/System/SystemInfo.cs
View File

@ -110,10 +110,10 @@ namespace MediaBrowser.Model.System
public string InternalMetadataPath { get; set; }
/// <summary>
/// Gets or sets the transcoding temporary path.
/// Gets or sets the transcode path.
/// </summary>
/// <value>The transcoding temporary path.</value>
public string TranscodePath { get; set; }
/// <value>The transcode path.</value>
public string TranscodingTempPath { get; set; }
/// <summary>
/// Gets or sets the HTTP server port number.