added recording status enum

3 files changed, 41 insertions, 7 deletions

diff --git a/MediaBrowser.Controller/LiveTv/ILiveTvManager.cs b/MediaBrowser.Controller/LiveTv/ILiveTvManager.cs
index e7b5d733b..9e4981331 100644
--- a/MediaBrowser.Controller/LiveTv/ILiveTvManager.cs
+++ b/MediaBrowser.Controller/LiveTv/ILiveTvManager.cs
@@ -29,11 +29,10 @@ namespace MediaBrowser.Controller.LiveTv
         QueryResult<ChannelInfoDto> GetChannels(ChannelQuery query);
 
         /// <summary>
-        /// Gets the channel information dto.
+        /// Gets the recordings.
         /// </summary>
-        /// <param name="info">The information.</param>
-        /// <returns>ChannelInfoDto.</returns>
-        ChannelInfoDto GetChannelInfoDto(Channel info);
+        /// <returns>QueryResult{RecordingInfoDto}.</returns>
+        QueryResult<RecordingInfoDto> GetRecordings();
 
         /// <summary>
         /// Gets the channel.
@@ -43,6 +42,14 @@ namespace MediaBrowser.Controller.LiveTv
         Channel GetChannel(string id);
 
         /// <summary>
+        /// Gets the channel.
+        /// </summary>
+        /// <param name="id">The identifier.</param>
+        /// <param name="userId">The user identifier.</param>
+        /// <returns>Channel.</returns>
+        ChannelInfoDto GetChannelInfoDto(string id, string userId);
+
+        /// <summary>
         /// Gets the programs.
         /// </summary>
         /// <param name="query">The query.</param>
diff --git a/MediaBrowser.Controller/LiveTv/ProgramInfo.cs b/MediaBrowser.Controller/LiveTv/ProgramInfo.cs
index 8314b9170..2231b4eaa 100644
--- a/MediaBrowser.Controller/LiveTv/ProgramInfo.cs
+++ b/MediaBrowser.Controller/LiveTv/ProgramInfo.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using MediaBrowser.Model.LiveTv;
 
 namespace MediaBrowser.Controller.LiveTv
 {
@@ -22,6 +23,12 @@ namespace MediaBrowser.Controller.LiveTv
         public string Name { get; set; }
 
         /// <summary>
+        /// Gets or sets the official rating.
+        /// </summary>
+        /// <value>The official rating.</value>
+        public string OfficialRating { get; set; }
+        
+        /// <summary>
         /// Description of the progam.
         /// </summary>
         public string Description { get; set; }
@@ -41,6 +48,24 @@ namespace MediaBrowser.Controller.LiveTv
         /// </summary>
         public List<string> Genres { get; set; }
 
+        /// <summary>
+        /// Gets or sets the quality.
+        /// </summary>
+        /// <value>The quality.</value>
+        public ProgramVideoQuality Quality { get; set; }
+
+        /// <summary>
+        /// Gets or sets the original air date.
+        /// </summary>
+        /// <value>The original air date.</value>
+        public DateTime? OriginalAirDate { get; set; }
+
+        /// <summary>
+        /// Gets or sets the audio.
+        /// </summary>
+        /// <value>The audio.</value>
+        public ProgramAudio Audio { get; set; }
+        
         public ProgramInfo()
         {
             Genres = new List<string>();
diff --git a/MediaBrowser.Controller/LiveTv/RecordingInfo.cs b/MediaBrowser.Controller/LiveTv/RecordingInfo.cs
index 0e4be52e3..f61bd9e78 100644
--- a/MediaBrowser.Controller/LiveTv/RecordingInfo.cs
+++ b/MediaBrowser.Controller/LiveTv/RecordingInfo.cs
@@ -1,4 +1,5 @@
-using System;
+using MediaBrowser.Model.LiveTv;
+using System;
 using System.Collections.Generic;
 
 namespace MediaBrowser.Controller.LiveTv
@@ -47,9 +48,10 @@ namespace MediaBrowser.Controller.LiveTv
         public DateTime EndDate { get; set; }
 
         /// <summary>
-        /// Status of the recording.
+        /// Gets or sets the status.
         /// </summary>
-        public string Status { get; set; } //TODO: Enum for status?? Difference NextPvr,Argus,...
+        /// <value>The status.</value>
+        public RecordingStatus Status { get; set; }
 
         /// <summary>
         /// Gets or sets a value indicating whether this instance is recurring.