Merge pull request #3 from MediaBrowser/master

Sync with Master

1 files changed, 6 insertions, 28 deletions

diff --git a/MediaBrowser.Model/Querying/NextUpQuery.cs b/MediaBrowser.Model/Querying/NextUpQuery.cs
index cdce2e307..0e9c9882f 100644
--- a/MediaBrowser.Model/Querying/NextUpQuery.cs
+++ b/MediaBrowser.Model/Querying/NextUpQuery.cs
@@ -10,6 +10,12 @@ namespace MediaBrowser.Model.Querying
         public string UserId { get; set; }
 
         /// <summary>
+        /// Gets or sets the parent identifier.
+        /// </summary>
+        /// <value>The parent identifier.</value>
+        public string ParentId { get; set; }
+        
+        /// <summary>
         /// Gets or sets the series id.
         /// </summary>
         /// <value>The series id.</value>
@@ -33,32 +39,4 @@ namespace MediaBrowser.Model.Querying
         /// <value>The fields.</value>
         public ItemFields[] Fields { get; set; }
     }
-
-    public class UpcomingEpisodesQuery
-    {
-        /// <summary>
-        /// Gets or sets the user id.
-        /// </summary>
-        /// <value>The user id.</value>
-        public string UserId { get; set; }
-
-        /// <summary>
-        /// Skips over a given number of items within the results. Use for paging.
-        /// </summary>
-        /// <value>The start index.</value>
-        public int? StartIndex { get; set; }
-
-        /// <summary>
-        /// The maximum number of items to return
-        /// </summary>
-        /// <value>The limit.</value>
-        public int? Limit { get; set; }
-
-        /// <summary>
-        /// Fields to return within the items, in addition to basic information
-        /// </summary>
-        /// <value>The fields.</value>
-        public ItemFields[] Fields { get; set; }
-    }
-
 }