7 files changed, 98 insertions, 3 deletions
diff --git a/MediaBrowser.Model/LiveTv/LiveTvChannelQuery.cs b/MediaBrowser.Model/LiveTv/LiveTvChannelQuery.cs
index 900537b7a..3a6ad0444 100644
--- a/MediaBrowser.Model/LiveTv/LiveTvChannelQuery.cs
+++ b/MediaBrowser.Model/LiveTv/LiveTvChannelQuery.cs
@@ -53,5 +53,11 @@ namespace MediaBrowser.Model.LiveTv
         /// </summary>
         /// <value>The limit.</value>
         public int? Limit { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether [add current program].
+        /// </summary>
+        /// <value><c>true</c> if [add current program]; otherwise, <c>false</c>.</value>
+        public bool AddCurrentProgram { get; set; }
     }
 }
diff --git a/MediaBrowser.Model/LiveTv/LiveTvOptions.cs b/MediaBrowser.Model/LiveTv/LiveTvOptions.cs
index c6f6ed84c..2b45422ec 100644
--- a/MediaBrowser.Model/LiveTv/LiveTvOptions.cs
+++ b/MediaBrowser.Model/LiveTv/LiveTvOptions.cs
@@ -1,13 +1,50 @@
-namespace MediaBrowser.Model.LiveTv
+using System.Collections.Generic;
+
+namespace MediaBrowser.Model.LiveTv
 {
     public class LiveTvOptions
     {
         public int? GuideDays { get; set; }
         public bool EnableMovieProviders { get; set; }
+        public string RecordingPath { get; set; }
+        public bool EnableAutoOrganize { get; set; }
+
+        public List<TunerHostInfo> TunerHosts { get; set; }
+        public List<ListingsProviderInfo> ListingProviders { get; set; }
 
+        public int PrePaddingSeconds { get; set; }
+        public int PostPaddingSeconds { get; set; }
+        
         public LiveTvOptions()
         {
             EnableMovieProviders = true;
+            TunerHosts = new List<TunerHostInfo>();
+            ListingProviders = new List<ListingsProviderInfo>();
         }
     }
+
+    public class TunerHostInfo
+    {
+        public string Id { get; set; }
+        public string Url { get; set; }
+        public string Type { get; set; }
+        public bool ImportFavoritesOnly { get; set; }
+        public bool IsEnabled { get; set; }
+
+        public TunerHostInfo()
+        {
+            IsEnabled = true;
+        }
+    }
+
+    public class ListingsProviderInfo
+    {
+        public string Id { get; set; }
+        public string Type { get; set; }
+        public string Username { get; set; }
+        public string Password { get; set; }
+        public string ListingsId { get; set; }
+        public string ZipCode { get; set; }
+        public string Country { get; set; }
+    }
 }
 \ No newline at end of file
diff --git a/MediaBrowser.Model/LiveTv/LiveTvServiceInfo.cs b/MediaBrowser.Model/LiveTv/LiveTvServiceInfo.cs
index 264870ffb..25d3b289f 100644
--- a/MediaBrowser.Model/LiveTv/LiveTvServiceInfo.cs
+++ b/MediaBrowser.Model/LiveTv/LiveTvServiceInfo.cs
@@ -42,6 +42,11 @@ namespace MediaBrowser.Model.LiveTv
         /// </summary>
         /// <value><c>true</c> if this instance has update available; otherwise, <c>false</c>.</value>
         public bool HasUpdateAvailable { get; set; }
+        /// <summary>
+        /// Gets or sets a value indicating whether this instance is visible.
+        /// </summary>
+        /// <value><c>true</c> if this instance is visible; otherwise, <c>false</c>.</value>
+        public bool IsVisible { get; set; }
 
         public List<LiveTvTunerInfoDto> Tuners { get; set; }
 
diff --git a/MediaBrowser.Model/LiveTv/ProgramQuery.cs b/MediaBrowser.Model/LiveTv/ProgramQuery.cs
index c19ba54bd..7a877e356 100644
--- a/MediaBrowser.Model/LiveTv/ProgramQuery.cs
+++ b/MediaBrowser.Model/LiveTv/ProgramQuery.cs
@@ -1,5 +1,6 @@
 using MediaBrowser.Model.Entities;
 using System;
+using MediaBrowser.Model.Querying;
 
 namespace MediaBrowser.Model.LiveTv
 {
@@ -16,6 +17,15 @@ namespace MediaBrowser.Model.LiveTv
         }
 
         /// <summary>
+        /// Fields to return within the items, in addition to basic information
+        /// </summary>
+        /// <value>The fields.</value>
+        public ItemFields[] Fields { get; set; }
+        public bool? EnableImages { get; set; }
+        public int? ImageTypeLimit { get; set; }
+        public ImageType[] EnableImageTypes { get; set; }
+        
+        /// <summary>
         /// Gets or sets the channel ids.
         /// </summary>
         /// <value>The channel ids.</value>
@@ -54,6 +64,11 @@ namespace MediaBrowser.Model.LiveTv
         public bool? IsMovie { get; set; }
 
         /// <summary>
+        /// Gets or sets a value indicating whether this instance is kids.
+        /// </summary>
+        /// <value><c>null</c> if [is kids] contains no value, <c>true</c> if [is kids]; otherwise, <c>false</c>.</value>
+        public bool? IsKids { get; set; }
+        /// <summary>
         /// Gets or sets a value indicating whether this instance is sports.
         /// </summary>
         /// <value><c>null</c> if [is sports] contains no value, <c>true</c> if [is sports]; otherwise, <c>false</c>.</value>
diff --git a/MediaBrowser.Model/LiveTv/RecommendedProgramQuery.cs b/MediaBrowser.Model/LiveTv/RecommendedProgramQuery.cs
index 4a8ae2365..e83a8fda6 100644
--- a/MediaBrowser.Model/LiveTv/RecommendedProgramQuery.cs
+++ b/MediaBrowser.Model/LiveTv/RecommendedProgramQuery.cs
@@ -1,8 +1,20 @@
-namespace MediaBrowser.Model.LiveTv
+using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Querying;
+
+namespace MediaBrowser.Model.LiveTv
 {
     public class RecommendedProgramQuery
     {
         /// <summary>
+        /// Fields to return within the items, in addition to basic information
+        /// </summary>
+        /// <value>The fields.</value>
+        public ItemFields[] Fields { get; set; }
+        public bool? EnableImages { get; set; }
+        public int? ImageTypeLimit { get; set; }
+        public ImageType[] EnableImageTypes { get; set; }
+        
+        /// <summary>
         /// Gets or sets the user identifier.
         /// </summary>
         /// <value>The user identifier.</value>
@@ -32,6 +44,11 @@
         /// <value><c>null</c> if [is movie] contains no value, <c>true</c> if [is movie]; otherwise, <c>false</c>.</value>
         public bool? IsMovie { get; set; }
         /// <summary>
+        /// Gets or sets a value indicating whether this instance is kids.
+        /// </summary>
+        /// <value><c>null</c> if [is kids] contains no value, <c>true</c> if [is kids]; otherwise, <c>false</c>.</value>
+        public bool? IsKids { get; set; }
+        /// <summary>
         /// Gets or sets a value indicating whether this instance is sports.
         /// </summary>
         /// <value><c>null</c> if [is sports] contains no value, <c>true</c> if [is sports]; otherwise, <c>false</c>.</value>
diff --git a/MediaBrowser.Model/LiveTv/RecordingQuery.cs b/MediaBrowser.Model/LiveTv/RecordingQuery.cs
index daa137db6..0cf997602 100644
--- a/MediaBrowser.Model/LiveTv/RecordingQuery.cs
+++ b/MediaBrowser.Model/LiveTv/RecordingQuery.cs
@@ -1,4 +1,7 @@
-namespace MediaBrowser.Model.LiveTv
+using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Querying;
+
+namespace MediaBrowser.Model.LiveTv
 {
     /// <summary>
     /// Class RecordingQuery.
@@ -58,5 +61,14 @@
         /// </summary>
         /// <value>The series timer identifier.</value>
         public string SeriesTimerId { get; set; }
+
+        /// <summary>
+        /// Fields to return within the items, in addition to basic information
+        /// </summary>
+        /// <value>The fields.</value>
+        public ItemFields[] Fields { get; set; }
+        public bool? EnableImages { get; set; }
+        public int? ImageTypeLimit { get; set; }
+        public ImageType[] EnableImageTypes { get; set; }
     }
 }
diff --git a/MediaBrowser.Model/LiveTv/SeriesTimerInfoDto.cs b/MediaBrowser.Model/LiveTv/SeriesTimerInfoDto.cs
index 7c590307f..4b88e42f3 100644
--- a/MediaBrowser.Model/LiveTv/SeriesTimerInfoDto.cs
+++ b/MediaBrowser.Model/LiveTv/SeriesTimerInfoDto.cs
@@ -6,6 +6,9 @@ using System.Runtime.Serialization;
 
 namespace MediaBrowser.Model.LiveTv
 {
+    /// <summary>
+    /// Class SeriesTimerInfoDto.
+    /// </summary>
     [DebuggerDisplay("Name = {Name}")]
     public class SeriesTimerInfoDto : BaseTimerInfoDto
     {