diff options
Diffstat (limited to 'MediaBrowser.Controller')
4 files changed, 5 insertions, 11 deletions
diff --git a/MediaBrowser.Controller/Channels/IChannelManager.cs b/MediaBrowser.Controller/Channels/IChannelManager.cs index 9177e2d81..792744628 100644 --- a/MediaBrowser.Controller/Channels/IChannelManager.cs +++ b/MediaBrowser.Controller/Channels/IChannelManager.cs @@ -15,16 +15,9 @@ namespace MediaBrowser.Controller.Channels /// Adds the parts. /// </summary> /// <param name="channels">The channels.</param> - /// <param name="factories">The factories.</param> void AddParts(IEnumerable<IChannel> channels); /// <summary> - /// Gets the channel download path. - /// </summary> - /// <value>The channel download path.</value> - string ChannelDownloadPath { get; } - - /// <summary> /// Gets the channel features. /// </summary> /// <param name="id">The identifier.</param> @@ -115,10 +108,9 @@ namespace MediaBrowser.Controller.Channels /// Gets the channel item media sources. /// </summary> /// <param name="item">The item.</param> - /// <param name="includeCachedVersions">if set to <c>true</c> [include cached versions].</param> /// <param name="cancellationToken">The cancellation token.</param> /// <returns>Task{IEnumerable{MediaSourceInfo}}.</returns> - Task<IEnumerable<MediaSourceInfo>> GetStaticMediaSources(BaseItem item, bool includeCachedVersions, CancellationToken cancellationToken); + Task<IEnumerable<MediaSourceInfo>> GetStaticMediaSources(BaseItem item, CancellationToken cancellationToken); /// <summary> /// Gets the channel folder. diff --git a/MediaBrowser.Controller/Entities/Audio/Audio.cs b/MediaBrowser.Controller/Entities/Audio/Audio.cs index e4f638cb6..3a6a7765b 100644 --- a/MediaBrowser.Controller/Entities/Audio/Audio.cs +++ b/MediaBrowser.Controller/Entities/Audio/Audio.cs @@ -206,7 +206,7 @@ namespace MediaBrowser.Controller.Entities.Audio { if (SourceType == SourceType.Channel) { - var sources = ChannelManager.GetStaticMediaSources(this, false, CancellationToken.None) + var sources = ChannelManager.GetStaticMediaSources(this, CancellationToken.None) .Result.ToList(); if (sources.Count > 0) diff --git a/MediaBrowser.Controller/Entities/Video.cs b/MediaBrowser.Controller/Entities/Video.cs index 7ba59df4f..47df12e1b 100644 --- a/MediaBrowser.Controller/Entities/Video.cs +++ b/MediaBrowser.Controller/Entities/Video.cs @@ -549,7 +549,7 @@ namespace MediaBrowser.Controller.Entities { if (SourceType == SourceType.Channel) { - var sources = ChannelManager.GetStaticMediaSources(this, false, CancellationToken.None) + var sources = ChannelManager.GetStaticMediaSources(this, CancellationToken.None) .Result.ToList(); if (sources.Count > 0) diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingJobOptions.cs b/MediaBrowser.Controller/MediaEncoding/EncodingJobOptions.cs index 844fafcde..d5fe790b9 100644 --- a/MediaBrowser.Controller/MediaEncoding/EncodingJobOptions.cs +++ b/MediaBrowser.Controller/MediaEncoding/EncodingJobOptions.cs @@ -35,6 +35,7 @@ namespace MediaBrowser.Controller.MediaEncoding public string VideoCodec { get; set; } + public int? TranscodingMaxAudioChannels { get; set; } public int? VideoBitRate { get; set; } public int? AudioStreamIndex { get; set; } public int? VideoStreamIndex { get; set; } @@ -86,6 +87,7 @@ namespace MediaBrowser.Controller.MediaEncoding MaxVideoBitDepth = info.MaxVideoBitDepth; SubtitleMethod = info.SubtitleDeliveryMethod; Context = info.Context; + TranscodingMaxAudioChannels = info.TranscodingMaxAudioChannels; if (info.SubtitleDeliveryMethod != SubtitleDeliveryMethod.External) { |