Merge pull request #2847 from MediaBrowser/beta

Beta

4 files changed, 8 insertions, 7 deletions

diff --git a/MediaBrowser.Model/Configuration/EncodingOptions.cs b/MediaBrowser.Model/Configuration/EncodingOptions.cs
index d619e3140..b093d82e3 100644
--- a/MediaBrowser.Model/Configuration/EncodingOptions.cs
+++ b/MediaBrowser.Model/Configuration/EncodingOptions.cs
@@ -14,6 +14,7 @@ namespace MediaBrowser.Model.Configuration
         public int H264Crf { get; set; }
         public string H264Preset { get; set; }
         public bool EnableHardwareEncoding { get; set; }
+        public bool EnableSubtitleExtraction { get; set; }
 
         public string[] HardwareDecodingCodecs { get; set; }
 
@@ -26,7 +27,7 @@ namespace MediaBrowser.Model.Configuration
             VaapiDevice = "/dev/dri/card0";
             H264Crf = 23;
             EnableHardwareEncoding = true;
-
+            EnableSubtitleExtraction = true;
             HardwareDecodingCodecs = new string[] { "h264", "vc1" };
         }
     }
diff --git a/MediaBrowser.Model/Configuration/MetadataOptions.cs b/MediaBrowser.Model/Configuration/MetadataOptions.cs
index ddde688b2..8a41decbf 100644
--- a/MediaBrowser.Model/Configuration/MetadataOptions.cs
+++ b/MediaBrowser.Model/Configuration/MetadataOptions.cs
@@ -29,7 +29,7 @@ namespace MediaBrowser.Model.Configuration
 
         public MetadataOptions(int backdropLimit, int minBackdropWidth)
         {
-            List<ImageOption> imageOptions = new List<ImageOption>
+            ImageOptions = new[]
             {
                 new ImageOption
                 {
@@ -39,7 +39,6 @@ namespace MediaBrowser.Model.Configuration
                 }
             };
 
-            ImageOptions = imageOptions.ToArray();
             DisabledMetadataSavers = new string[] { };
             LocalMetadataReaderOrder = new string[] { };
 
diff --git a/MediaBrowser.Model/Configuration/MetadataPluginSummary.cs b/MediaBrowser.Model/Configuration/MetadataPluginSummary.cs
index 90b3933eb..80142cf43 100644
--- a/MediaBrowser.Model/Configuration/MetadataPluginSummary.cs
+++ b/MediaBrowser.Model/Configuration/MetadataPluginSummary.cs
@@ -15,18 +15,18 @@ namespace MediaBrowser.Model.Configuration
         /// Gets or sets the plugins.
         /// </summary>
         /// <value>The plugins.</value>
-        public List<MetadataPlugin> Plugins { get; set; }
+        public MetadataPlugin[] Plugins { get; set; }
 
         /// <summary>
         /// Gets or sets the supported image types.
         /// </summary>
         /// <value>The supported image types.</value>
-        public List<ImageType> SupportedImageTypes { get; set; }
+        public ImageType[] SupportedImageTypes { get; set; }
 
         public MetadataPluginSummary()
         {
-            SupportedImageTypes = new List<ImageType>();
-            Plugins = new List<MetadataPlugin>();
+            SupportedImageTypes = new ImageType[] { };
+            Plugins = new MetadataPlugin[] { };
         }
     }
 }
\ No newline at end of file
diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
index db66837e4..5177a757a 100644
--- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
@@ -217,6 +217,7 @@ namespace MediaBrowser.Model.Configuration
             EnableHttps = false;
             EnableDashboardResponseCaching = true;
             EnableAnonymousUsageReporting = true;
+            EnableCaseSensitiveItemIds = true;
 
             EnableAutomaticRestart = true;