diff options
| author | Luke <luke.pulverenti@gmail.com> | 2015-04-28 11:03:34 -0400 |
|---|---|---|
| committer | Luke <luke.pulverenti@gmail.com> | 2015-04-28 11:03:34 -0400 |
| commit | 23da60856958e1a219cccafeb002ae182b3f812a (patch) | |
| tree | 52dfd1706f6ae3c8a6d133a105cc09d07d470db1 /MediaBrowser.Model/Configuration | |
| parent | e14fa7d8e5b8c97eafec6670797958593e4506f8 (diff) | |
| parent | 0442de79f4d2ad5d577cb7a5220386f23a7b3f12 (diff) | |
Merge pull request #1089 from MediaBrowser/dev
3.0.5597.0
Diffstat (limited to 'MediaBrowser.Model/Configuration')
3 files changed, 7 insertions, 3 deletions
diff --git a/MediaBrowser.Model/Configuration/BaseApplicationConfiguration.cs b/MediaBrowser.Model/Configuration/BaseApplicationConfiguration.cs index 19620890e..ca9db0bf0 100644 --- a/MediaBrowser.Model/Configuration/BaseApplicationConfiguration.cs +++ b/MediaBrowser.Model/Configuration/BaseApplicationConfiguration.cs @@ -51,6 +51,12 @@ namespace MediaBrowser.Model.Configuration public string CachePath { get; set; } /// <summary> + /// Gets or sets a value indicating whether [enable custom path sub folders]. + /// </summary> + /// <value><c>true</c> if [enable custom path sub folders]; otherwise, <c>false</c>.</value> + public bool EnableCustomPathSubFolders { get; set; } + + /// <summary> /// Initializes a new instance of the <see cref="BaseApplicationConfiguration" /> class. /// </summary> public BaseApplicationConfiguration() diff --git a/MediaBrowser.Model/Configuration/EncodingOptions.cs b/MediaBrowser.Model/Configuration/EncodingOptions.cs index c44a7c94d..afd67eb15 100644 --- a/MediaBrowser.Model/Configuration/EncodingOptions.cs +++ b/MediaBrowser.Model/Configuration/EncodingOptions.cs @@ -17,7 +17,7 @@ namespace MediaBrowser.Model.Configuration DownMixAudioBoost = 2; EncodingQuality = EncodingQuality.Auto; EnableThrottling = true; - ThrottleThresholdSeconds = 90; + ThrottleThresholdSeconds = 120; } } } diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs index ac9bd6b08..8a3a2a3e4 100644 --- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs +++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs @@ -185,8 +185,6 @@ namespace MediaBrowser.Model.Configuration public MetadataOptions[] MetadataOptions { get; set; } - public string TranscodingTempPath { get; set; } - public bool EnableAutomaticRestart { get; set; } public bool EnableRealtimeMonitor { get; set; } |