improve cancellation support of auto-organize

2 files changed, 11 insertions, 1 deletions

diff --git a/MediaBrowser.Controller/LiveTv/ILiveTvManager.cs b/MediaBrowser.Controller/LiveTv/ILiveTvManager.cs
index 5242c5b1f2..c8fa6be8ce 100644
--- a/MediaBrowser.Controller/LiveTv/ILiveTvManager.cs
+++ b/MediaBrowser.Controller/LiveTv/ILiveTvManager.cs
@@ -157,7 +157,7 @@ namespace MediaBrowser.Controller.LiveTv
         /// <param name="mediaSourceId">The media source identifier.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task{StreamResponseInfo}.</returns>
-        Task<Tuple<MediaSourceInfo, IDirectStreamProvider, bool>> GetChannelStream(string id, string mediaSourceId, CancellationToken cancellationToken);
+        Task<Tuple<MediaSourceInfo, IDirectStreamProvider>> GetChannelStream(string id, string mediaSourceId, CancellationToken cancellationToken);
 
         /// <summary>
         /// Gets the program.
diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
index 530ff13430..dd31d39b10 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
@@ -743,6 +743,11 @@ namespace MediaBrowser.Controller.MediaEncoding
 
         public bool CanStreamCopyVideo(EncodingJobInfo state, MediaStream videoStream)
         {
+            if (!videoStream.AllowStreamCopy)
+            {
+                return false;
+            }
+
             var request = state.BaseRequest;
 
             if (videoStream.IsInterlaced)
@@ -883,6 +888,11 @@ namespace MediaBrowser.Controller.MediaEncoding
 
         public bool CanStreamCopyAudio(EncodingJobInfo state, MediaStream audioStream, List<string> supportedAudioCodecs)
         {
+            if (!audioStream.AllowStreamCopy)
+            {
+                return false;
+            }
+
             var request = state.BaseRequest;
 
             // Source and target codecs must match