diff options
| author | Luke <luke.pulverenti@gmail.com> | 2016-03-22 14:15:24 -0400 |
|---|---|---|
| committer | Luke <luke.pulverenti@gmail.com> | 2016-03-22 14:15:24 -0400 |
| commit | 4ea4236460b3a0d1529df3f3f2385f4b213fc774 (patch) | |
| tree | c32c342af4a01154966e816d9a985460e6f551d7 /MediaBrowser.Controller | |
| parent | ebbc4904430f2e04736614997d644ee75a485c46 (diff) | |
| parent | 4f025c8e4a33dafdeee3199c72eedce733645273 (diff) | |
Merge pull request #1574 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.Controller')
| -rw-r--r-- | MediaBrowser.Controller/Dto/DtoOptions.cs | 1 | ||||
| -rw-r--r-- | MediaBrowser.Controller/LiveTv/ILiveTvManager.cs | 23 |
2 files changed, 3 insertions, 21 deletions
diff --git a/MediaBrowser.Controller/Dto/DtoOptions.cs b/MediaBrowser.Controller/Dto/DtoOptions.cs index a8d1b1862..d627cc67a 100644 --- a/MediaBrowser.Controller/Dto/DtoOptions.cs +++ b/MediaBrowser.Controller/Dto/DtoOptions.cs @@ -17,6 +17,7 @@ namespace MediaBrowser.Controller.Dto public List<ImageType> ImageTypes { get; set; } public int ImageTypeLimit { get; set; } public bool EnableImages { get; set; } + public bool AddProgramRecordingInfo { get; set; } public string DeviceId { get; set; } public DtoOptions() diff --git a/MediaBrowser.Controller/LiveTv/ILiveTvManager.cs b/MediaBrowser.Controller/LiveTv/ILiveTvManager.cs index bd25b23f7..4cc7b27ea 100644 --- a/MediaBrowser.Controller/LiveTv/ILiveTvManager.cs +++ b/MediaBrowser.Controller/LiveTv/ILiveTvManager.cs @@ -75,15 +75,6 @@ namespace MediaBrowser.Controller.LiveTv void AddParts(IEnumerable<ILiveTvService> services, IEnumerable<ITunerHost> tunerHosts, IEnumerable<IListingsProvider> listingProviders); /// <summary> - /// Gets the channels. - /// </summary> - /// <param name="query">The query.</param> - /// <param name="options">The options.</param> - /// <param name="cancellationToken">The cancellation token.</param> - /// <returns>IEnumerable{Channel}.</returns> - Task<QueryResult<ChannelInfoDto>> GetChannels(LiveTvChannelQuery query, DtoOptions options, CancellationToken cancellationToken); - - /// <summary> /// Gets the recording. /// </summary> /// <param name="id">The identifier.</param> @@ -92,15 +83,6 @@ namespace MediaBrowser.Controller.LiveTv /// <param name="user">The user.</param> /// <returns>Task{RecordingInfoDto}.</returns> Task<BaseItemDto> GetRecording(string id, DtoOptions options, CancellationToken cancellationToken, User user = null); - - /// <summary> - /// Gets the channel. - /// </summary> - /// <param name="id">The identifier.</param> - /// <param name="cancellationToken">The cancellation token.</param> - /// <param name="user">The user.</param> - /// <returns>Task{RecordingInfoDto}.</returns> - Task<ChannelInfoDto> GetChannel(string id, CancellationToken cancellationToken, User user = null); /// <summary> /// Gets the timer. @@ -385,11 +367,10 @@ namespace MediaBrowser.Controller.LiveTv /// <summary> /// Adds the channel information. /// </summary> - /// <param name="dto">The dto.</param> - /// <param name="channel">The channel.</param> + /// <param name="items">The items.</param> /// <param name="options">The options.</param> /// <param name="user">The user.</param> - void AddChannelInfo(BaseItemDto dto, LiveTvChannel channel, DtoOptions options, User user); + void AddChannelInfo(List<Tuple<BaseItemDto, LiveTvChannel>> items, DtoOptions options, User user); /// <summary> /// Called when [recording file deleted]. |