Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

1 files changed, 11 insertions, 1 deletions

diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
index bdf072b50..f7b4cf373 100644
--- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
@@ -223,7 +223,10 @@ namespace MediaBrowser.Model.Configuration
         public string TranscodingTempPath { get; set; }
 
         public bool EnableAutomaticRestart { get; set; }
-        
+
+
+        public LiveTvOptions LiveTvOptions { get; set; }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="ServerConfiguration" /> class.
         /// </summary>
@@ -287,6 +290,8 @@ namespace MediaBrowser.Model.Configuration
             {
                  MaxBackdrops = 1
             };
+
+            LiveTvOptions = new LiveTvOptions();
         }
     }
 
@@ -303,4 +308,9 @@ namespace MediaBrowser.Model.Configuration
         HighQuality,
         MaxQuality
     }
+
+    public class LiveTvOptions
+    {
+        public int? GuideDays { get; set; }
+    }
 }