add channels infrastructure

MediaBrowser.Model/Channels/ChannelQuery.cs

@@ -1,4 +1,6 @@
-
+using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Querying;
+
 namespace MediaBrowser.Model.Channels
 {
     public class ChannelQuery
@@ -35,7 +37,7 @@ namespace MediaBrowser.Model.Channels
         /// </summary>
         /// <value>The category identifier.</value>
         public string CategoryId { get; set; }
-        
+
         /// <summary>
         /// Gets or sets the user identifier.
         /// </summary>
@@ -53,5 +55,15 @@ namespace MediaBrowser.Model.Channels
         /// </summary>
         /// <value>The limit.</value>
         public int? Limit { get; set; }
+
+        public SortOrder? SortOrder { get; set; }
+        public string[] SortBy { get; set; }
+        public ItemFilter[] Filters { get; set; }
+
+        public ChannelItemQuery()
+        {
+            Filters = new ItemFilter[] { };
+            SortBy = new string[] { };
+        }
     }
 }

MediaBrowser.Model/Configuration/UserConfiguration.cs

@@ -57,6 +57,7 @@ namespace MediaBrowser.Model.Configuration
         public bool GroupMoviesIntoBoxSets { get; set; }
 
         public string[] BlockedMediaFolders { get; set; }
+        public string[] BlockedChannels { get; set; }
 
         public UnratedItem[] BlockUnratedItems { get; set; }
 
@@ -74,6 +75,7 @@ namespace MediaBrowser.Model.Configuration
             GroupMoviesIntoBoxSets = true;
 
             BlockedMediaFolders = new string[] { };
+            BlockedChannels = new string[] { };
             BlockUnratedItems = new UnratedItem[] { };
         }
     }
@@ -88,6 +90,7 @@ namespace MediaBrowser.Model.Configuration
         Book,
         LiveTvChannel,
         LiveTvProgram,
+        ChannelContent,
         Other
     }
 }