Merge pull request #28 from MediaBrowser/dev

Dev

7 files changed, 32 insertions, 35 deletions

diff --git a/MediaBrowser.Model/Configuration/AutoOnOff.cs b/MediaBrowser.Model/Configuration/AutoOnOff.cs
deleted file mode 100644
index e911a0ff1..000000000
--- a/MediaBrowser.Model/Configuration/AutoOnOff.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-
-namespace MediaBrowser.Model.Configuration
-{
-    public enum AutoOnOff
-    {
-        Auto,
-        Enabled,
-        Disabled
-    }
-}
diff --git a/MediaBrowser.Model/Configuration/ChapterOptions.cs b/MediaBrowser.Model/Configuration/ChapterOptions.cs
index f9ff6b4f9..1c2b0c527 100644
--- a/MediaBrowser.Model/Configuration/ChapterOptions.cs
+++ b/MediaBrowser.Model/Configuration/ChapterOptions.cs
@@ -6,20 +6,6 @@
         public bool EnableEpisodeChapterImageExtraction { get; set; }
         public bool EnableOtherVideoChapterImageExtraction { get; set; }
 
-        public bool DownloadMovieChapters { get; set; }
-        public bool DownloadEpisodeChapters { get; set; }
-
-        public string[] FetcherOrder { get; set; }
-        public string[] DisabledFetchers { get; set; }
-
         public bool ExtractDuringLibraryScan { get; set; }
-      
-        public ChapterOptions()
-        {
-            DownloadMovieChapters = true;
-
-            DisabledFetchers = new string[] { };
-            FetcherOrder = new string[] { };
-        }
     }
 }
\ No newline at end of file
diff --git a/MediaBrowser.Model/Configuration/DlnaOptions.cs b/MediaBrowser.Model/Configuration/DlnaOptions.cs
index 6eaf01c4a..71a24d707 100644
--- a/MediaBrowser.Model/Configuration/DlnaOptions.cs
+++ b/MediaBrowser.Model/Configuration/DlnaOptions.cs
@@ -10,7 +10,6 @@ namespace MediaBrowser.Model.Configuration
         public int ClientDiscoveryIntervalSeconds { get; set; }
         public int BlastAliveMessageIntervalSeconds { get; set; }
         public string DefaultUserId { get; set; }
-        public bool EnableMovieFolders { get; set; }
 
         public DlnaOptions()
         {
diff --git a/MediaBrowser.Model/Configuration/EncodingOptions.cs b/MediaBrowser.Model/Configuration/EncodingOptions.cs
index 3c03dc12a..9a0b2d35b 100644
--- a/MediaBrowser.Model/Configuration/EncodingOptions.cs
+++ b/MediaBrowser.Model/Configuration/EncodingOptions.cs
@@ -11,6 +11,8 @@ namespace MediaBrowser.Model.Configuration
         public string HardwareAccelerationType { get; set; }
         public string EncoderAppPath { get; set; }
         public string VaapiDevice { get; set; }
+        public int H264Crf { get; set; }
+        public string H264Preset { get; set; }
 
         public EncodingOptions()
         {
@@ -19,6 +21,7 @@ namespace MediaBrowser.Model.Configuration
             ThrottleDelaySeconds = 180;
             EncodingThreadCount = -1;
             VaapiDevice = "/dev/dri/card0";
+            H264Crf = 23;
         }
     }
 }
diff --git a/MediaBrowser.Model/Configuration/LibraryOptions.cs b/MediaBrowser.Model/Configuration/LibraryOptions.cs
index 3fe694553..5f8c77ccd 100644
--- a/MediaBrowser.Model/Configuration/LibraryOptions.cs
+++ b/MediaBrowser.Model/Configuration/LibraryOptions.cs
@@ -6,11 +6,26 @@
         public bool EnablePhotos { get; set; }
         public bool EnableRealtimeMonitor { get; set; }
         public int SchemaVersion { get; set; }
+        public bool EnableChapterImageExtraction { get; set; }
+        public bool ExtractChapterImagesDuringLibraryScan { get; set; }
+        public bool DownloadImagesInAdvance { get; set; }
+        public MediaPathInfo[] PathInfos { get; set; }
+
+        public bool SaveLocalMetadata { get; set; }
+        public bool EnableInternetProviders { get; set; }
 
         public LibraryOptions()
         {
             EnablePhotos = true;
             EnableRealtimeMonitor = true;
+            PathInfos = new MediaPathInfo[] { };
+            EnableInternetProviders = true;
         }
     }
+
+    public class MediaPathInfo
+    {
+        public string Path { get; set; }
+        public string NetworkPath { get; set; }
+    }
 }
diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
index a891a422a..a1e5637a4 100644
--- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
@@ -73,6 +73,7 @@ namespace MediaBrowser.Model.Configuration
         /// </summary>
         /// <value>The metadata path.</value>
         public string MetadataPath { get; set; }
+        public string MetadataNetworkPath { get; set; }
 
         public string LastVersion { get; set; }
 
@@ -167,6 +168,8 @@ namespace MediaBrowser.Model.Configuration
         public MetadataOptions[] MetadataOptions { get; set; }
 
         public bool EnableAutomaticRestart { get; set; }
+        public bool SkipDeserializationForBasicTypes { get; set; }
+        public bool SkipDeserializationForPrograms { get; set; }
 
         public PathSubstitution[] PathSubstitutions { get; set; }
 
@@ -176,7 +179,6 @@ namespace MediaBrowser.Model.Configuration
         public string UICulture { get; set; }
 
         public PeopleMetadataOptions PeopleMetadataOptions { get; set; }
-        public bool FindInternetTrailers { get; set; }
 
         public bool SaveMetadataHidden { get; set; }
 
@@ -184,8 +186,6 @@ namespace MediaBrowser.Model.Configuration
 
         public int RemoteClientBitrateLimit { get; set; }
 
-        public AutoOnOff EnableLibraryMonitor { get; set; }
-
         public int SharingExpirationDays { get; set; }
 
         public string[] Migrations { get; set; }
@@ -194,8 +194,6 @@ namespace MediaBrowser.Model.Configuration
         public int SchemaVersion { get; set; }
         public int SqliteCacheSize { get; set; }
 
-        public bool DownloadImagesInAdvance { get; set; }
-
         public bool EnableAnonymousUsageReporting { get; set; }
         public bool EnableStandaloneMusicKeys { get; set; }
         public bool EnableLocalizedGuids { get; set; }
@@ -205,7 +203,11 @@ namespace MediaBrowser.Model.Configuration
         public bool DisplayCollectionsView { get; set; }
         public string[] LocalNetworkAddresses { get; set; }
         public string[] CodecsUsed { get; set; }
+        public bool EnableChannelView { get; set; }
+        public bool EnableExternalContentInSuggestions { get; set; }
+        public bool EnableSimpleArtistDetection { get; set; }
 
+        public int ImageExtractionTimeoutMs { get; set; }
         /// <summary>
         /// Initializes a new instance of the <see cref="ServerConfiguration" /> class.
         /// </summary>
@@ -215,9 +217,11 @@ namespace MediaBrowser.Model.Configuration
             Migrations = new string[] { };
             CodecsUsed = new string[] { };
             SqliteCacheSize = 0;
+            ImageExtractionTimeoutMs = 0;
 
             EnableLocalizedGuids = true;
             DisplaySpecialsWithinSeasons = true;
+            EnableExternalContentInSuggestions = true;
 
             ImageSavingConvention = ImageSavingConvention.Compatible;
             PublicPort = 8096;
@@ -230,6 +234,7 @@ namespace MediaBrowser.Model.Configuration
             EnableAnonymousUsageReporting = true;
 
             EnableAutomaticRestart = true;
+            EnableFolderView = true;
 
             EnableUPnP = true;
             SharingExpirationDays = 30;
@@ -239,11 +244,9 @@ namespace MediaBrowser.Model.Configuration
             // 5 minutes
             MinResumeDurationSeconds = 300;
 
-            EnableLibraryMonitor = AutoOnOff.Auto;
             LibraryMonitorDelay = 60;
 
             EnableInternetProviders = true;
-            FindInternetTrailers = true;
 
             PathSubstitutions = new PathSubstitution[] { };
             ContentTypes = new NameValuePair[] { };
@@ -432,7 +435,8 @@ namespace MediaBrowser.Model.Configuration
                             Limit = 0,
                             Type = ImageType.Disc
                         }
-                    }
+                    },
+                    DisabledMetadataFetchers = new []{ "TheAudioDB" }
                 },
 
                 new MetadataOptions(1, 1280)
@@ -470,7 +474,8 @@ namespace MediaBrowser.Model.Configuration
                             Limit = 0,
                             Type = ImageType.Logo
                         }
-                    }
+                    },
+                    DisabledMetadataFetchers = new []{ "TheAudioDB" }
                 },
 
                 new MetadataOptions(1, 1280)
diff --git a/MediaBrowser.Model/Configuration/UserConfiguration.cs b/MediaBrowser.Model/Configuration/UserConfiguration.cs
index 313c5243c..a6785a06a 100644
--- a/MediaBrowser.Model/Configuration/UserConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/UserConfiguration.cs
@@ -41,7 +41,6 @@ namespace MediaBrowser.Model.Configuration
         public string[] PlainFolderViews { get; set; }
 
         public bool HidePlayedInLatest { get; set; }
-        public bool EnableChannelView { get; set; }
 
         public bool RememberAudioSelections { get; set; }
         public bool RememberSubtitleSelections { get; set; }