aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Model
diff options
context:
space:
mode:
Diffstat (limited to 'MediaBrowser.Model')
-rw-r--r--MediaBrowser.Model/Channels/ChannelQuery.cs16
-rw-r--r--MediaBrowser.Model/Configuration/UserConfiguration.cs3
2 files changed, 17 insertions, 2 deletions
diff --git a/MediaBrowser.Model/Channels/ChannelQuery.cs b/MediaBrowser.Model/Channels/ChannelQuery.cs
index 13a87efb6..e09769b00 100644
--- a/MediaBrowser.Model/Channels/ChannelQuery.cs
+++ b/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[] { };
+ }
}
}
diff --git a/MediaBrowser.Model/Configuration/UserConfiguration.cs b/MediaBrowser.Model/Configuration/UserConfiguration.cs
index 8bee53c44..f8df19436 100644
--- a/MediaBrowser.Model/Configuration/UserConfiguration.cs
+++ b/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
}
}