separate provider options

6 files changed, 52 insertions, 16 deletions

diff --git a/MediaBrowser.Model/Configuration/FanartOptions.cs b/MediaBrowser.Model/Configuration/FanartOptions.cs
new file mode 100644
index 0000000000..e992abe5de
--- /dev/null
+++ b/MediaBrowser.Model/Configuration/FanartOptions.cs
@@ -0,0 +1,17 @@
+
+namespace MediaBrowser.Model.Configuration
+{
+    public class FanartOptions
+    {
+        /// <summary>
+        /// Gets or sets a value indicating whether [enable automatic updates].
+        /// </summary>
+        /// <value><c>true</c> if [enable automatic updates]; otherwise, <c>false</c>.</value>
+        public bool EnableAutomaticUpdates { get; set; }
+        /// <summary>
+        /// Gets or sets the user API key.
+        /// </summary>
+        /// <value>The user API key.</value>
+        public string UserApiKey { get; set; }
+    }
+}
diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
index 755fe8aa83..e51cca7708 100644
--- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
@@ -1,5 +1,4 @@
-using System.Xml.Schema;
-using MediaBrowser.Model.Dto;
+using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
 
 namespace MediaBrowser.Model.Configuration
@@ -32,10 +31,11 @@ namespace MediaBrowser.Model.Configuration
         /// </summary>
         /// <value>The HTTPS server port number.</value>
         public int HttpsPortNumber { get; set; }
-        
-        /// Gets or sets the value pointing to the file system where the ssl certiifcate is located.
+
+        /// <summary>
+        /// Gets or sets a value indicating whether [use HTTPS].
         /// </summary>
-        /// <value>The value pointing to the file system where the ssl certiifcate is located.</value>
+        /// <value><c>true</c> if [use HTTPS]; otherwise, <c>false</c>.</value>
         public bool UseHttps { get; set; }
 
         /// <summary>
@@ -154,6 +154,7 @@ namespace MediaBrowser.Model.Configuration
         /// </summary>
         /// <value><c>true</c> if [enable dashboard response caching]; otherwise, <c>false</c>.</value>
         public bool EnableDashboardResponseCaching { get; set; }
+        public bool EnableDashboardResourceMinification { get; set; }
 
         /// <summary>
         /// Allows the dashboard to be served from a custom path.
@@ -161,18 +162,8 @@ namespace MediaBrowser.Model.Configuration
         /// <value>The dashboard source path.</value>
         public string DashboardSourcePath { get; set; }
 
-        /// <summary>
-        /// Gets or sets a value indicating whether [enable tv db updates].
-        /// </summary>
-        /// <value><c>true</c> if [enable tv db updates]; otherwise, <c>false</c>.</value>
-        public bool EnableTvDbUpdates { get; set; }
-        public bool EnableTmdbUpdates { get; set; }
-
         public bool StoreArtistsInMetadata { get; set; }
 
-        public bool EnableFanArtUpdates { get; set; }
-        public string FanartApiKey { get; set; }
-
         /// <summary>
         /// Gets or sets the image saving convention.
         /// </summary>
@@ -220,6 +211,7 @@ namespace MediaBrowser.Model.Configuration
             UseHttps = false;
             CertificatePath = null;
             EnableDashboardResponseCaching = true;
+            EnableDashboardResourceMinification = true;
 
             EnableAutomaticRestart = true;
             EnableWin8HttpListener = true;
diff --git a/MediaBrowser.Model/Configuration/TheMovieDbOptions.cs b/MediaBrowser.Model/Configuration/TheMovieDbOptions.cs
new file mode 100644
index 0000000000..9a73e34764
--- /dev/null
+++ b/MediaBrowser.Model/Configuration/TheMovieDbOptions.cs
@@ -0,0 +1,12 @@
+
+namespace MediaBrowser.Model.Configuration
+{
+    public class TheMovieDbOptions
+    {
+        /// <summary>
+        /// Gets or sets a value indicating whether [enable automatic updates].
+        /// </summary>
+        /// <value><c>true</c> if [enable automatic updates]; otherwise, <c>false</c>.</value>
+        public bool EnableAutomaticUpdates { get; set; }
+    }
+}
diff --git a/MediaBrowser.Model/Configuration/TvdbOptions.cs b/MediaBrowser.Model/Configuration/TvdbOptions.cs
new file mode 100644
index 0000000000..034af609c4
--- /dev/null
+++ b/MediaBrowser.Model/Configuration/TvdbOptions.cs
@@ -0,0 +1,12 @@
+
+namespace MediaBrowser.Model.Configuration
+{
+    public class TvdbOptions
+    {
+        /// <summary>
+        /// Gets or sets a value indicating whether [enable automatic updates].
+        /// </summary>
+        /// <value><c>true</c> if [enable automatic updates]; otherwise, <c>false</c>.</value>
+        public bool EnableAutomaticUpdates { get; set; }
+    }
+}
diff --git a/MediaBrowser.Model/Dlna/StreamBuilder.cs b/MediaBrowser.Model/Dlna/StreamBuilder.cs
index f1c6875379..721da54a80 100644
--- a/MediaBrowser.Model/Dlna/StreamBuilder.cs
+++ b/MediaBrowser.Model/Dlna/StreamBuilder.cs
@@ -548,7 +548,7 @@ namespace MediaBrowser.Model.Dlna
             {
                 SubtitleProfile externalProfile = GetSubtitleProfile(options.Profile.SubtitleProfiles, SubtitleDeliveryMethod.External, _serverTextSubtitleOutputs);
 
-                if (options.Context == EncodingContext.Streaming && externalProfile != null)
+                if (externalProfile != null)
                 {
                     return externalProfile;
                 }
diff --git a/MediaBrowser.Model/MediaBrowser.Model.csproj b/MediaBrowser.Model/MediaBrowser.Model.csproj
index 599e4a9021..716f795625 100644
--- a/MediaBrowser.Model/MediaBrowser.Model.csproj
+++ b/MediaBrowser.Model/MediaBrowser.Model.csproj
@@ -97,8 +97,11 @@
     <Compile Include="Configuration\ChapterOptions.cs" />
     <Compile Include="Configuration\CinemaModeConfiguration.cs" />
     <Compile Include="Configuration\EncodingOptions.cs" />
+    <Compile Include="Configuration\FanartOptions.cs" />
     <Compile Include="Configuration\MetadataConfiguration.cs" />
     <Compile Include="Configuration\PeopleMetadataOptions.cs" />
+    <Compile Include="Configuration\TheMovieDbOptions.cs" />
+    <Compile Include="Configuration\TvdbOptions.cs" />
     <Compile Include="Configuration\XbmcMetadataOptions.cs" />
     <Compile Include="Configuration\SubtitlePlaybackMode.cs" />
     <Compile Include="Connect\ConnectAuthenticationExchangeResult.cs" />