Merge branch 'master' into providermanager-cleanup

5 files changed, 17 insertions, 15 deletions

diff --git a/MediaBrowser.Model/Configuration/EmbeddedSubtitleOptions.cs b/MediaBrowser.Model/Configuration/EmbeddedSubtitleOptions.cs
index 42f07dbff..98e0f84e3 100644
--- a/MediaBrowser.Model/Configuration/EmbeddedSubtitleOptions.cs
+++ b/MediaBrowser.Model/Configuration/EmbeddedSubtitleOptions.cs
@@ -5,7 +5,6 @@ namespace MediaBrowser.Model.Configuration
     /// </summary>
     public enum EmbeddedSubtitleOptions
     {
-
         /// <summary>
         /// Allow all embedded subs.
         /// </summary>
@@ -26,5 +25,4 @@ namespace MediaBrowser.Model.Configuration
         /// </summary>
         AllowNone = 3,
     }
-
 }
diff --git a/MediaBrowser.Model/Configuration/EncodingOptions.cs b/MediaBrowser.Model/Configuration/EncodingOptions.cs
index 06931ac3b..f4cd2f006 100644
--- a/MediaBrowser.Model/Configuration/EncodingOptions.cs
+++ b/MediaBrowser.Model/Configuration/EncodingOptions.cs
@@ -1,5 +1,3 @@
-using System;
-
 #nullable disable
 #pragma warning disable CS1591
 
@@ -26,6 +24,8 @@ namespace MediaBrowser.Model.Configuration
             TonemappingThreshold = 0.8;
             TonemappingPeak = 100;
             TonemappingParam = 0;
+            VppTonemappingBrightness = 0;
+            VppTonemappingContrast = 1.2;
             H264Crf = 23;
             H265Crf = 28;
             DeinterlaceDoubleRate = false;
@@ -39,7 +39,7 @@ namespace MediaBrowser.Model.Configuration
             EnableHardwareEncoding = true;
             AllowHevcEncoding = false;
             EnableSubtitleExtraction = true;
-            AllowOnDemandMetadataBasedKeyframeExtractionForExtensions = Array.Empty<string>();
+            AllowOnDemandMetadataBasedKeyframeExtractionForExtensions = new[] { "mkv" };
             HardwareDecodingCodecs = new string[] { "h264", "vc1" };
         }
 
@@ -89,6 +89,10 @@ namespace MediaBrowser.Model.Configuration
 
         public double TonemappingParam { get; set; }
 
+        public double VppTonemappingBrightness { get; set; }
+
+        public double VppTonemappingContrast { get; set; }
+
         public int H264Crf { get; set; }
 
         public int H265Crf { get; set; }
diff --git a/MediaBrowser.Model/Configuration/LibraryOptions.cs b/MediaBrowser.Model/Configuration/LibraryOptions.cs
index ad3bce86e..c4d313bdb 100644
--- a/MediaBrowser.Model/Configuration/LibraryOptions.cs
+++ b/MediaBrowser.Model/Configuration/LibraryOptions.cs
@@ -17,7 +17,7 @@ namespace MediaBrowser.Model.Configuration
             RequirePerfectSubtitleMatch = true;
             AllowEmbeddedSubtitles = EmbeddedSubtitleOptions.AllowAll;
 
-            AutomaticallyAddToCollection = true;
+            AutomaticallyAddToCollection = false;
             EnablePhotos = true;
             SaveSubtitlesWithMedia = true;
             EnableRealtimeMonitor = true;
diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
index 46e61ee1a..e61b896b9 100644
--- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
@@ -79,7 +79,7 @@ namespace MediaBrowser.Model.Configuration
         /// <summary>
         /// Gets or sets a value indicating whether quick connect is available for use on this server.
         /// </summary>
-        public bool QuickConnectAvailable { get; set; } = false;
+        public bool QuickConnectAvailable { get; set; } = true;
 
         /// <summary>
         /// Gets or sets a value indicating whether [enable case sensitive item ids].
diff --git a/MediaBrowser.Model/Configuration/UserConfiguration.cs b/MediaBrowser.Model/Configuration/UserConfiguration.cs
index 81359462c..94f354660 100644
--- a/MediaBrowser.Model/Configuration/UserConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/UserConfiguration.cs
@@ -22,10 +22,10 @@ namespace MediaBrowser.Model.Configuration
             HidePlayedInLatest = true;
             PlayDefaultAudioTrack = true;
 
-            LatestItemsExcludes = Array.Empty<string>();
-            OrderedViews = Array.Empty<string>();
-            MyMediaExcludes = Array.Empty<string>();
-            GroupedFolders = Array.Empty<string>();
+            LatestItemsExcludes = Array.Empty<Guid>();
+            OrderedViews = Array.Empty<Guid>();
+            MyMediaExcludes = Array.Empty<Guid>();
+            GroupedFolders = Array.Empty<Guid>();
         }
 
         /// <summary>
@@ -48,7 +48,7 @@ namespace MediaBrowser.Model.Configuration
 
         public bool DisplayMissingEpisodes { get; set; }
 
-        public string[] GroupedFolders { get; set; }
+        public Guid[] GroupedFolders { get; set; }
 
         public SubtitlePlaybackMode SubtitleMode { get; set; }
 
@@ -56,11 +56,11 @@ namespace MediaBrowser.Model.Configuration
 
         public bool EnableLocalPassword { get; set; }
 
-        public string[] OrderedViews { get; set; }
+        public Guid[] OrderedViews { get; set; }
 
-        public string[] LatestItemsExcludes { get; set; }
+        public Guid[] LatestItemsExcludes { get; set; }
 
-        public string[] MyMediaExcludes { get; set; }
+        public Guid[] MyMediaExcludes { get; set; }
 
         public bool HidePlayedInLatest { get; set; }