Merge branch 'dev' of https://github.com/MediaBrowser/MediaBrowser into dev

1 files changed, 10 insertions, 4 deletions

diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
index a0a7fc90d..e7490b3fa 100644
--- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
@@ -187,7 +187,6 @@ namespace MediaBrowser.Model.Configuration
 
         public bool EnableAutomaticRestart { get; set; }
 
-        public bool EnableRealtimeMonitor { get; set; }
         public PathSubstitution[] PathSubstitutions { get; set; }
 
         public string ServerName { get; set; }
@@ -208,6 +207,10 @@ namespace MediaBrowser.Model.Configuration
         public bool EnableVideoArchiveFiles { get; set; }
         public int RemoteClientBitrateLimit { get; set; }
 
+        public bool DenyIFrameEmbedding { get; set; }
+
+        public AutoOnOff EnableLibraryMonitor { get; set; }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="ServerConfiguration" /> class.
         /// </summary>
@@ -224,6 +227,7 @@ namespace MediaBrowser.Model.Configuration
             EnableDashboardResourceMinification = true;
 
             EnableAutomaticRestart = true;
+            DenyIFrameEmbedding = true;
 
             EnableUPnP = true;
 
@@ -233,6 +237,7 @@ namespace MediaBrowser.Model.Configuration
             // 5 minutes
             MinResumeDurationSeconds = 300;
 
+            EnableLibraryMonitor = AutoOnOff.Auto;
             RealtimeLibraryMonitorDelay = 40;
 
             EnableInternetProviders = true;
@@ -250,8 +255,6 @@ namespace MediaBrowser.Model.Configuration
 
             SeasonZeroDisplayName = "Specials";
 
-            EnableRealtimeMonitor = true;
-
             UICulture = "en-us";
 
             PeopleMetadataOptions = new PeopleMetadataOptions();
@@ -426,7 +429,10 @@ namespace MediaBrowser.Model.Configuration
                     }
                 },
 
-                new MetadataOptions(0, 1280) {ItemType = "Season"}
+                new MetadataOptions(0, 1280)
+                {
+                    ItemType = "Season"
+                }
             };
         }
     }