aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Controller
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2014-05-27 13:09:48 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2014-05-27 13:09:48 -0400
commit680ffeebf7bc4b5f07daa360ba4b89526cd2db9f (patch)
tree6871c5f64731539aaeee14ac3f8f6d97b807f6ee /MediaBrowser.Controller
parent4c87979cac4df6560145b96d440aeba967466951 (diff)
updated nuget
Diffstat (limited to 'MediaBrowser.Controller')
-rw-r--r--MediaBrowser.Controller/Channels/ChannelFolderItem.cs2
-rw-r--r--MediaBrowser.Controller/Channels/ChannelItemInfo.cs1
-rw-r--r--MediaBrowser.Controller/Channels/IChannel.cs8
-rw-r--r--MediaBrowser.Controller/Channels/IChannelManager.cs7
4 files changed, 10 insertions, 8 deletions
diff --git a/MediaBrowser.Controller/Channels/ChannelFolderItem.cs b/MediaBrowser.Controller/Channels/ChannelFolderItem.cs
index 3b66e52ce..5be30d7c3 100644
--- a/MediaBrowser.Controller/Channels/ChannelFolderItem.cs
+++ b/MediaBrowser.Controller/Channels/ChannelFolderItem.cs
@@ -1,4 +1,5 @@
using MediaBrowser.Controller.Entities;
+using MediaBrowser.Model.Channels;
using MediaBrowser.Model.Configuration;
using System.Collections.Generic;
@@ -11,6 +12,7 @@ namespace MediaBrowser.Controller.Channels
public string ChannelId { get; set; }
public ChannelItemType ChannelItemType { get; set; }
+ public ChannelFolderType ChannelFolderType { get; set; }
public string OriginalImageUrl { get; set; }
public List<string> Tags { get; set; }
diff --git a/MediaBrowser.Controller/Channels/ChannelItemInfo.cs b/MediaBrowser.Controller/Channels/ChannelItemInfo.cs
index 66718d7cd..707807bd5 100644
--- a/MediaBrowser.Controller/Channels/ChannelItemInfo.cs
+++ b/MediaBrowser.Controller/Channels/ChannelItemInfo.cs
@@ -33,6 +33,7 @@ namespace MediaBrowser.Controller.Channels
public string ImageUrl { get; set; }
public ChannelMediaType MediaType { get; set; }
+ public ChannelFolderType FolderType { get; set; }
public ChannelMediaContentType ContentType { get; set; }
diff --git a/MediaBrowser.Controller/Channels/IChannel.cs b/MediaBrowser.Controller/Channels/IChannel.cs
index 7f03579f3..799df9182 100644
--- a/MediaBrowser.Controller/Channels/IChannel.cs
+++ b/MediaBrowser.Controller/Channels/IChannel.cs
@@ -59,14 +59,6 @@ namespace MediaBrowser.Controller.Channels
Task<ChannelItemResult> GetChannelItems(InternalChannelItemQuery query, CancellationToken cancellationToken);
/// <summary>
- /// Gets all media.
- /// </summary>
- /// <param name="query">The query.</param>
- /// <param name="cancellationToken">The cancellation token.</param>
- /// <returns>Task{ChannelItemResult}.</returns>
- Task<ChannelItemResult> GetAllMedia(InternalAllChannelItemsQuery query, CancellationToken cancellationToken);
-
- /// <summary>
/// Gets the channel image.
/// </summary>
/// <param name="type">The type.</param>
diff --git a/MediaBrowser.Controller/Channels/IChannelManager.cs b/MediaBrowser.Controller/Channels/IChannelManager.cs
index 9ffe43827..4c2d665e5 100644
--- a/MediaBrowser.Controller/Channels/IChannelManager.cs
+++ b/MediaBrowser.Controller/Channels/IChannelManager.cs
@@ -17,6 +17,13 @@ namespace MediaBrowser.Controller.Channels
void AddParts(IEnumerable<IChannel> channels, IEnumerable<IChannelFactory> factories);
/// <summary>
+ /// Gets the channel features.
+ /// </summary>
+ /// <param name="id">The identifier.</param>
+ /// <returns>ChannelFeatures.</returns>
+ ChannelFeatures GetChannelFeatures(string id);
+
+ /// <summary>
/// Gets the channel.
/// </summary>
/// <param name="id">The identifier.</param>