diff options
| author | Luke <luke.pulverenti@gmail.com> | 2017-02-01 15:57:05 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-01 15:57:05 -0500 |
| commit | 7ab5db614f6fdccdeac4b66a08d1a0ab34902792 (patch) | |
| tree | 8a0a31f41fe95618e687bacceb6ea6e81c4b4bd3 /MediaBrowser.Controller | |
| parent | 8cef129580670dcf49855dd75e167baace3b609d (diff) | |
| parent | 39e8e3cbe7865ba618c67c612a191b134f5ad186 (diff) | |
Merge pull request #2436 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.Controller')
| -rw-r--r-- | MediaBrowser.Controller/LiveTv/ChannelInfo.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.Controller/LiveTv/IListingsProvider.cs | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/MediaBrowser.Controller/LiveTv/ChannelInfo.cs b/MediaBrowser.Controller/LiveTv/ChannelInfo.cs index 372b095fd1..fae9076588 100644 --- a/MediaBrowser.Controller/LiveTv/ChannelInfo.cs +++ b/MediaBrowser.Controller/LiveTv/ChannelInfo.cs @@ -25,6 +25,8 @@ namespace MediaBrowser.Controller.LiveTv /// <value>The id of the channel.</value> public string Id { get; set; } + public string TunerChannelId { get; set; } + /// <summary> /// Gets or sets the tuner host identifier. /// </summary> diff --git a/MediaBrowser.Controller/LiveTv/IListingsProvider.cs b/MediaBrowser.Controller/LiveTv/IListingsProvider.cs index 5ecd70cc5c..3d610544ee 100644 --- a/MediaBrowser.Controller/LiveTv/IListingsProvider.cs +++ b/MediaBrowser.Controller/LiveTv/IListingsProvider.cs @@ -11,7 +11,7 @@ namespace MediaBrowser.Controller.LiveTv { string Name { get; } string Type { get; } - Task<IEnumerable<ProgramInfo>> GetProgramsAsync(ListingsProviderInfo info, string channelNumber, string channelName, DateTime startDateUtc, DateTime endDateUtc, CancellationToken cancellationToken); + Task<IEnumerable<ProgramInfo>> GetProgramsAsync(ListingsProviderInfo info, string channelId, string channelNumber, string channelName, DateTime startDateUtc, DateTime endDateUtc, CancellationToken cancellationToken); Task AddMetadata(ListingsProviderInfo info, List<ChannelInfo> channels, CancellationToken cancellationToken); Task Validate(ListingsProviderInfo info, bool validateLogin, bool validateListings); Task<List<NameIdPair>> GetLineups(ListingsProviderInfo info, string country, string location); |
