diff options
Diffstat (limited to 'MediaBrowser.Model')
| -rw-r--r-- | MediaBrowser.Model/ApiClient/IApiClient.cs | 27 | ||||
| -rw-r--r-- | MediaBrowser.Model/LiveTv/ChannelInfoDto.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.Model/LiveTv/LiveTvChannelQuery.cs (renamed from MediaBrowser.Model/LiveTv/ChannelQuery.cs) | 4 | ||||
| -rw-r--r-- | MediaBrowser.Model/LiveTv/LiveTvChannelType.cs (renamed from MediaBrowser.Model/LiveTv/ChannelType.cs) | 2 | ||||
| -rw-r--r-- | MediaBrowser.Model/LiveTv/RecordingInfoDto.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.Model/MediaBrowser.Model.csproj | 4 |
6 files changed, 33 insertions, 8 deletions
diff --git a/MediaBrowser.Model/ApiClient/IApiClient.cs b/MediaBrowser.Model/ApiClient/IApiClient.cs index f30bb5daf..e5597cbc0 100644 --- a/MediaBrowser.Model/ApiClient/IApiClient.cs +++ b/MediaBrowser.Model/ApiClient/IApiClient.cs @@ -1,4 +1,5 @@ -using MediaBrowser.Model.Configuration; +using MediaBrowser.Model.Channels; +using MediaBrowser.Model.Configuration; using MediaBrowser.Model.Dto; using MediaBrowser.Model.Entities; using MediaBrowser.Model.Globalization; @@ -1147,5 +1148,29 @@ namespace MediaBrowser.Model.ApiClient /// <param name="cancellationToken">The cancellation token.</param> /// <returns>Task{SeriesTimerInfoDto}.</returns> Task<SeriesTimerInfoDto> GetDefaultLiveTvTimerInfo(string programId, CancellationToken cancellationToken); + + /// <summary> + /// Gets the channel features. + /// </summary> + /// <param name="channelId">The channel identifier.</param> + /// <param name="cancellationToken">The cancellation token.</param> + /// <returns>Task{ChannelFeatures}.</returns> + Task<ChannelFeatures> GetChannelFeatures(string channelId, CancellationToken cancellationToken); + + /// <summary> + /// Gets the channel items. + /// </summary> + /// <param name="query">The query.</param> + /// <param name="cancellationToken">The cancellation token.</param> + /// <returns>Task{QueryResult{BaseItemDto}}.</returns> + Task<QueryResult<BaseItemDto>> GetChannelItems(ChannelItemQuery query, CancellationToken cancellationToken); + + /// <summary> + /// Gets the channels. + /// </summary> + /// <param name="query">The query.</param> + /// <param name="cancellationToken">The cancellation token.</param> + /// <returns>Task{QueryResult{BaseItemDto}}.</returns> + Task<QueryResult<BaseItemDto>> GetChannels(ChannelQuery query, CancellationToken cancellationToken); } }
\ No newline at end of file diff --git a/MediaBrowser.Model/LiveTv/ChannelInfoDto.cs b/MediaBrowser.Model/LiveTv/ChannelInfoDto.cs index 2f244b4e3..8be745a12 100644 --- a/MediaBrowser.Model/LiveTv/ChannelInfoDto.cs +++ b/MediaBrowser.Model/LiveTv/ChannelInfoDto.cs @@ -62,7 +62,7 @@ namespace MediaBrowser.Model.LiveTv /// Gets or sets the type of the channel. /// </summary> /// <value>The type of the channel.</value> - public ChannelType ChannelType { get; set; } + public LiveTvChannelType ChannelType { get; set; } /// <summary> /// Gets or sets the type. diff --git a/MediaBrowser.Model/LiveTv/ChannelQuery.cs b/MediaBrowser.Model/LiveTv/LiveTvChannelQuery.cs index 6d986d337..75fcb7a10 100644 --- a/MediaBrowser.Model/LiveTv/ChannelQuery.cs +++ b/MediaBrowser.Model/LiveTv/LiveTvChannelQuery.cs @@ -4,13 +4,13 @@ namespace MediaBrowser.Model.LiveTv /// <summary> /// Class ChannelQuery. /// </summary> - public class ChannelQuery + public class LiveTvChannelQuery { /// <summary> /// Gets or sets the type of the channel. /// </summary> /// <value>The type of the channel.</value> - public ChannelType? ChannelType { get; set; } + public LiveTvChannelType? ChannelType { get; set; } /// <summary> /// Gets or sets a value indicating whether this instance is favorite. diff --git a/MediaBrowser.Model/LiveTv/ChannelType.cs b/MediaBrowser.Model/LiveTv/LiveTvChannelType.cs index bca16f839..d447f73a2 100644 --- a/MediaBrowser.Model/LiveTv/ChannelType.cs +++ b/MediaBrowser.Model/LiveTv/LiveTvChannelType.cs @@ -4,7 +4,7 @@ namespace MediaBrowser.Model.LiveTv /// <summary> /// Enum ChannelType /// </summary> - public enum ChannelType + public enum LiveTvChannelType { /// <summary> /// The TV diff --git a/MediaBrowser.Model/LiveTv/RecordingInfoDto.cs b/MediaBrowser.Model/LiveTv/RecordingInfoDto.cs index 58bca06bd..d03e1a4e4 100644 --- a/MediaBrowser.Model/LiveTv/RecordingInfoDto.cs +++ b/MediaBrowser.Model/LiveTv/RecordingInfoDto.cs @@ -164,7 +164,7 @@ namespace MediaBrowser.Model.LiveTv /// Gets or sets the type of the channel. /// </summary> /// <value>The type of the channel.</value> - public ChannelType ChannelType { get; set; } + public LiveTvChannelType ChannelType { get; set; } /// <summary> /// Gets or sets the official rating. diff --git a/MediaBrowser.Model/MediaBrowser.Model.csproj b/MediaBrowser.Model/MediaBrowser.Model.csproj index c98db03c0..1a66adafd 100644 --- a/MediaBrowser.Model/MediaBrowser.Model.csproj +++ b/MediaBrowser.Model/MediaBrowser.Model.csproj @@ -154,7 +154,7 @@ <Compile Include="Library\PlayAccess.cs" /> <Compile Include="LiveTv\BaseTimerInfoDto.cs" /> <Compile Include="LiveTv\ChannelInfoDto.cs" /> - <Compile Include="LiveTv\ChannelQuery.cs" /> + <Compile Include="LiveTv\LiveTvChannelQuery.cs" /> <Compile Include="LiveTv\DayPattern.cs" /> <Compile Include="LiveTv\GuideInfo.cs" /> <Compile Include="LiveTv\LiveTvInfo.cs" /> @@ -200,7 +200,7 @@ <Compile Include="IO\IIsoManager.cs" /> <Compile Include="IO\IIsoMount.cs" /> <Compile Include="IO\IIsoMounter.cs" /> - <Compile Include="LiveTv\ChannelType.cs" /> + <Compile Include="LiveTv\LiveTvChannelType.cs" /> <Compile Include="LiveTv\LiveTvServiceInfo.cs" /> <Compile Include="LiveTv\RecordingInfoDto.cs" /> <Compile Include="Net\WebSocketMessage.cs" /> |