updated live tv models

6 files changed, 38 insertions, 44 deletions

diff --git a/MediaBrowser.Model/LiveTv/ChannelQuery.cs b/MediaBrowser.Model/LiveTv/ChannelQuery.cs
index 9fe74502fd..578f3039bb 100644
--- a/MediaBrowser.Model/LiveTv/ChannelQuery.cs
+++ b/MediaBrowser.Model/LiveTv/ChannelQuery.cs
@@ -7,12 +7,6 @@ namespace MediaBrowser.Model.LiveTv
     public class ChannelQuery
     {
         /// <summary>
-        /// Gets or sets the name of the service.
-        /// </summary>
-        /// <value>The name of the service.</value>
-        public string ServiceName { get; set; }
-
-        /// <summary>
         /// Gets or sets the type of the channel.
         /// </summary>
         /// <value>The type of the channel.</value>
diff --git a/MediaBrowser.Model/LiveTv/ProgramInfoDto.cs b/MediaBrowser.Model/LiveTv/ProgramInfoDto.cs
index 6884d355d1..5f35de086d 100644
--- a/MediaBrowser.Model/LiveTv/ProgramInfoDto.cs
+++ b/MediaBrowser.Model/LiveTv/ProgramInfoDto.cs
@@ -52,9 +52,9 @@ namespace MediaBrowser.Model.LiveTv
         public string Name { get; set; }
 
         /// <summary>
-        /// Description of the progam.
+        /// Overview of the recording.
         /// </summary>
-        public string Description { get; set; }
+        public string Overview { get; set; }
 
         /// <summary>
         /// The start date of the program, in UTC.
@@ -72,16 +72,16 @@ namespace MediaBrowser.Model.LiveTv
         public List<string> Genres { get; set; }
 
         /// <summary>
-        /// Gets or sets the quality.
+        /// Gets or sets a value indicating whether this instance is hd.
         /// </summary>
-        /// <value>The quality.</value>
-        public ProgramVideoQuality Quality { get; set; }
+        /// <value><c>true</c> if this instance is hd; otherwise, <c>false</c>.</value>
+        public bool? IsHD { get; set; }
 
         /// <summary>
         /// Gets or sets the audio.
         /// </summary>
         /// <value>The audio.</value>
-        public ProgramAudio Audio { get; set; }
+        public ProgramAudio? Audio { get; set; }
         
         /// <summary>
         /// Gets or sets the original air date.
@@ -107,12 +107,6 @@ namespace MediaBrowser.Model.LiveTv
         }
     }
 
-    public enum ProgramVideoQuality
-    {
-        StandardDefinition,
-        HighDefinition
-    }
-
     public enum ProgramAudio
     {
         Stereo
diff --git a/MediaBrowser.Model/LiveTv/ProgramQuery.cs b/MediaBrowser.Model/LiveTv/ProgramQuery.cs
index ce0639aa0e..c2a913bc85 100644
--- a/MediaBrowser.Model/LiveTv/ProgramQuery.cs
+++ b/MediaBrowser.Model/LiveTv/ProgramQuery.cs
@@ -6,12 +6,6 @@
     public class ProgramQuery
     {
         /// <summary>
-        /// Gets or sets the name of the service.
-        /// </summary>
-        /// <value>The name of the service.</value>
-        public string ServiceName { get; set; }
-
-        /// <summary>
         /// Gets or sets the channel identifier.
         /// </summary>
         /// <value>The channel identifier.</value>
diff --git a/MediaBrowser.Model/LiveTv/RecordingInfoDto.cs b/MediaBrowser.Model/LiveTv/RecordingInfoDto.cs
index 86e82b562d..a095e1751b 100644
--- a/MediaBrowser.Model/LiveTv/RecordingInfoDto.cs
+++ b/MediaBrowser.Model/LiveTv/RecordingInfoDto.cs
@@ -44,9 +44,9 @@ namespace MediaBrowser.Model.LiveTv
         public string Path { get; set; }
 
         /// <summary>
-        /// Description of the recording.
+        /// Overview of the recording.
         /// </summary>
-        public string Description { get; set; }
+        public string Overview { get; set; }
 
         /// <summary>
         /// The start date of the recording, in UTC.
@@ -111,6 +111,18 @@ namespace MediaBrowser.Model.LiveTv
         /// <value>The community rating.</value>
         public float? CommunityRating { get; set; }
 
+        /// <summary>
+        /// Gets or sets a value indicating whether this instance is hd.
+        /// </summary>
+        /// <value><c>true</c> if this instance is hd; otherwise, <c>false</c>.</value>
+        public bool? IsHD { get; set; }
+
+        /// <summary>
+        /// Gets or sets the audio.
+        /// </summary>
+        /// <value>The audio.</value>
+        public ProgramAudio? Audio { get; set; }
+
         public RecordingInfoDto()
         {
             Genres = new List<string>();
diff --git a/MediaBrowser.Model/LiveTv/RecordingQuery.cs b/MediaBrowser.Model/LiveTv/RecordingQuery.cs
index 0820c7785e..cd5ebe6282 100644
--- a/MediaBrowser.Model/LiveTv/RecordingQuery.cs
+++ b/MediaBrowser.Model/LiveTv/RecordingQuery.cs
@@ -10,12 +10,6 @@
         /// </summary>
         /// <value>The channel identifier.</value>
         public string ChannelId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the name of the service.
-        /// </summary>
-        /// <value>The name of the service.</value>
-        public string ServiceName { get; set; }
     }
 
     public class TimerQuery
@@ -25,11 +19,5 @@
         /// </summary>
         /// <value>The channel identifier.</value>
         public string ChannelId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the name of the service.
-        /// </summary>
-        /// <value>The name of the service.</value>
-        public string ServiceName { get; set; }
     }
 }
diff --git a/MediaBrowser.Model/LiveTv/TimerInfoDto.cs b/MediaBrowser.Model/LiveTv/TimerInfoDto.cs
index 9ebc2314d4..e8085fc92f 100644
--- a/MediaBrowser.Model/LiveTv/TimerInfoDto.cs
+++ b/MediaBrowser.Model/LiveTv/TimerInfoDto.cs
@@ -64,16 +64,28 @@ namespace MediaBrowser.Model.LiveTv
         public string SeriesTimerId { get; set; }
 
         /// <summary>
-        /// Gets or sets the pre padding seconds.
+        /// Gets or sets the requested pre padding seconds.
         /// </summary>
-        /// <value>The pre padding seconds.</value>
-        public int PrePaddingSeconds { get; set; }
+        /// <value>The requested pre padding seconds.</value>
+        public int RequestedPrePaddingSeconds { get; set; }
 
         /// <summary>
-        /// Gets or sets the post padding seconds.
+        /// Gets or sets the requested post padding seconds.
         /// </summary>
-        /// <value>The post padding seconds.</value>
-        public int PostPaddingSeconds { get; set; }
+        /// <value>The requested post padding seconds.</value>
+        public int RequestedPostPaddingSeconds { get; set; }
+
+        /// <summary>
+        /// Gets or sets the required pre padding seconds.
+        /// </summary>
+        /// <value>The required pre padding seconds.</value>
+        public int RequiredPrePaddingSeconds { get; set; }
+
+        /// <summary>
+        /// Gets or sets the required post padding seconds.
+        /// </summary>
+        /// <value>The required post padding seconds.</value>
+        public int RequiredPostPaddingSeconds { get; set; }
 
         /// <summary>
         /// Gets or sets the duration ms.