소스 검색

Remove more unused args

cvium 3 년 전
부모
커밋
1a5a74d2a9

+ 1 - 1
Emby.Server.Implementations/LiveTv/EmbyTV/DirectRecorder.cs

@@ -58,7 +58,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                 using var cancellationTokenSource = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken, durationToken.Token);
                 var linkedCancellationToken = cancellationTokenSource.Token;
 
-                await using var fileStream = new ProgressiveFileStream(directStreamProvider.GetStream(), null, null);
+                await using var fileStream = new ProgressiveFileStream(directStreamProvider.GetStream());
                 await _streamHelper.CopyToAsync(
                     fileStream,
                     output,

+ 1 - 1
Jellyfin.Api/Controllers/LiveTvController.cs

@@ -1207,7 +1207,7 @@ namespace Jellyfin.Api.Controllers
                 return NotFound();
             }
 
-            var liveStream = new ProgressiveFileStream(liveStreamInfo.GetStream(), null, _transcodingJobHelper);
+            var liveStream = new ProgressiveFileStream(liveStreamInfo.GetStream());
             return new FileStreamResult(liveStream, MimeTypes.GetMimeType("file." + container));
         }
 

+ 1 - 1
Jellyfin.Api/Controllers/VideosController.cs

@@ -454,7 +454,7 @@ namespace Jellyfin.Api.Controllers
                 StreamingHelpers.AddDlnaHeaders(state, Response.Headers, true, startTimeTicks, Request, _dlnaManager);
 
                 var liveStreamInfo = _mediaSourceManager.GetLiveStreamInfo(streamingRequest.LiveStreamId);
-                var liveStream = new ProgressiveFileStream(liveStreamInfo.GetStream(), null, _transcodingJobHelper);
+                var liveStream = new ProgressiveFileStream(liveStreamInfo.GetStream());
                 // TODO (moved from MediaBrowser.Api): Don't hardcode contentType
                 return File(liveStream, MimeTypes.GetMimeType("file.ts")!);
             }

+ 1 - 1
Jellyfin.Api/Helpers/AudioHelper.cs

@@ -121,7 +121,7 @@ namespace Jellyfin.Api.Helpers
                 StreamingHelpers.AddDlnaHeaders(state, _httpContextAccessor.HttpContext.Response.Headers, true, streamingRequest.StartTimeTicks, _httpContextAccessor.HttpContext.Request, _dlnaManager);
 
                 var liveStreamInfo = _mediaSourceManager.GetLiveStreamInfo(streamingRequest.LiveStreamId);
-                var liveStream = new ProgressiveFileStream(liveStreamInfo.GetStream(), null, _transcodingJobHelper);
+                var liveStream = new ProgressiveFileStream(liveStreamInfo.GetStream());
                 // TODO (moved from MediaBrowser.Api): Don't hardcode contentType
                 return new FileStreamResult(liveStream, MimeTypes.GetMimeType("file.ts"));
             }

+ 3 - 5
Jellyfin.Api/Helpers/ProgressiveFileStream.cs

@@ -51,13 +51,11 @@ namespace Jellyfin.Api.Helpers
         /// Initializes a new instance of the <see cref="ProgressiveFileStream"/> class.
         /// </summary>
         /// <param name="stream">The stream to progressively copy.</param>
-        /// <param name="job">The transcoding job information.</param>
-        /// <param name="transcodingJobHelper">The transcoding job helper.</param>
         /// <param name="timeoutMs">The timeout duration in milliseconds.</param>
-        public ProgressiveFileStream(Stream stream, TranscodingJobDto? job, TranscodingJobHelper? transcodingJobHelper, int timeoutMs = 30000)
+        public ProgressiveFileStream(Stream stream, int timeoutMs = 30000)
         {
-            _job = job;
-            _transcodingJobHelper = transcodingJobHelper;
+            _job = null;
+            _transcodingJobHelper = null;
             _timeoutMs = timeoutMs;
             _allowAsyncFileRead = AsyncFile.UseAsyncIO;
             _stream = stream;