Merge pull request #3 from MediaBrowser/master

Sync with Master

1 files changed, 5 insertions, 26 deletions

diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
index 0fb9db6c0..c19039439 100644
--- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
@@ -221,6 +221,8 @@ namespace MediaBrowser.Model.Configuration
 
         public NotificationOptions NotificationOptions { get; set; }
 
+        public SubtitleOptions SubtitleOptions { get; set; }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="ServerConfiguration" /> class.
         /// </summary>
@@ -269,7 +271,7 @@ namespace MediaBrowser.Model.Configuration
 
             EnableRealtimeMonitor = true;
 
-            var options = new List<MetadataOptions>
+            List<MetadataOptions> options = new List<MetadataOptions>
             {
                 new MetadataOptions(1, 1280) {ItemType = "Book"},
                 new MetadataOptions(1, 1280) {ItemType = "MusicAlbum"},
@@ -284,31 +286,8 @@ namespace MediaBrowser.Model.Configuration
             UICulture = "en-us";
 
             NotificationOptions = new NotificationOptions();
-        }
-    }
-
-    public enum ImageSavingConvention
-    {
-        Legacy,
-        Compatible
-    }
-
-    public enum EncodingQuality
-    {
-        Auto,
-        HighSpeed,
-        HighQuality,
-        MaxQuality
-    }
 
-    public class LiveTvOptions
-    {
-        public int? GuideDays { get; set; }
-    }
-
-    public class PathSubstitution
-    {
-        public string From { get; set; }
-        public string To { get; set; }
+            SubtitleOptions = new SubtitleOptions();
+        }
     }
 }