mirror of
https://github.com/jellyfin/jellyfin.git
synced 2026-04-21 17:44:43 +01:00
Merge branch 'master' into warn17
This commit is contained in:
@@ -1,3 +1,6 @@
|
||||
using System;
|
||||
using System.Xml.Serialization;
|
||||
|
||||
namespace MediaBrowser.Model.Configuration
|
||||
{
|
||||
/// <summary>
|
||||
@@ -25,6 +28,24 @@ namespace MediaBrowser.Model.Configuration
|
||||
/// <value>The cache path.</value>
|
||||
public string CachePath { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Last known version that was ran using the configuration.
|
||||
/// </summary>
|
||||
/// <value>The version from previous run.</value>
|
||||
[XmlIgnore]
|
||||
public Version PreviousVersion { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Stringified PreviousVersion to be stored/loaded,
|
||||
/// because System.Version itself isn't xml-serializable
|
||||
/// </summary>
|
||||
/// <value>String value of PreviousVersion</value>
|
||||
public string PreviousVersionStr
|
||||
{
|
||||
get => PreviousVersion?.ToString();
|
||||
set => PreviousVersion = Version.Parse(value);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Initializes a new instance of the <see cref="BaseApplicationConfiguration" /> class.
|
||||
/// </summary>
|
||||
|
||||
@@ -33,7 +33,7 @@ namespace MediaBrowser.Model.Configuration
|
||||
public EncodingOptions()
|
||||
{
|
||||
DownMixAudioBoost = 2;
|
||||
EnableThrottling = true;
|
||||
EnableThrottling = false;
|
||||
ThrottleDelaySeconds = 180;
|
||||
EncodingThreadCount = -1;
|
||||
// This is a DRM device that is almost guaranteed to be there on every intel platform, plus it's the default one in ffmpeg if you don't specify anything
|
||||
|
||||
@@ -237,7 +237,7 @@ namespace MediaBrowser.Model.Configuration
|
||||
CodecsUsed = Array.Empty<string>();
|
||||
PathSubstitutions = Array.Empty<PathSubstitution>();
|
||||
IgnoreVirtualInterfaces = false;
|
||||
EnableSimpleArtistDetection = true;
|
||||
EnableSimpleArtistDetection = false;
|
||||
|
||||
DisplaySpecialsWithinSeasons = true;
|
||||
EnableExternalContentInSuggestions = true;
|
||||
@@ -247,7 +247,7 @@ namespace MediaBrowser.Model.Configuration
|
||||
PublicHttpsPort = DefaultHttpsPort;
|
||||
HttpServerPortNumber = DefaultHttpPort;
|
||||
HttpsPortNumber = DefaultHttpsPort;
|
||||
EnableHttps = true;
|
||||
EnableHttps = false;
|
||||
EnableDashboardResponseCaching = true;
|
||||
EnableCaseSensitiveItemIds = true;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user