1 files changed, 31 insertions, 60 deletions

diff --git a/MediaBrowser.Api/Playback/StreamState.cs b/MediaBrowser.Api/Playback/StreamState.cs
index 8d4b0cb3d..ba3c2bfba 100644
--- a/MediaBrowser.Api/Playback/StreamState.cs
+++ b/MediaBrowser.Api/Playback/StreamState.cs
@@ -1,9 +1,7 @@
 using System;
-using System.IO;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.MediaEncoding;
 using MediaBrowser.Model.Dlna;
-using MediaBrowser.Model.Net;
 using Microsoft.Extensions.Logging;
 
 namespace MediaBrowser.Api.Playback
@@ -12,6 +10,7 @@ namespace MediaBrowser.Api.Playback
     {
         private readonly ILogger _logger;
         private readonly IMediaSourceManager _mediaSourceManager;
+        private bool _disposed = false;
 
         public string RequestedUrl { get; set; }
 
@@ -30,11 +29,6 @@ namespace MediaBrowser.Api.Playback
 
         public VideoStreamRequest VideoRequest => Request as VideoStreamRequest;
 
-        /// <summary>
-        /// Gets or sets the log file stream.
-        /// </summary>
-        /// <value>The log file stream.</value>
-        public Stream LogFileStream { get; set; }
         public IDirectStreamProvider DirectStreamProvider { get; set; }
 
         public string WaitForPath { get; set; }
@@ -72,6 +66,7 @@ namespace MediaBrowser.Api.Playback
                     {
                         return 3;
                     }
+
                     return 6;
                 }
 
@@ -94,6 +89,16 @@ namespace MediaBrowser.Api.Playback
 
         public string UserAgent { get; set; }
 
+        public bool EstimateContentLength { get; set; }
+
+        public TranscodeSeekInfo TranscodeSeekInfo { get; set; }
+
+        public bool EnableDlnaHeaders { get; set; }
+
+        public DeviceProfile DeviceProfile { get; set; }
+
+        public TranscodingJob TranscodingJob { get; set; }
+
         public StreamState(IMediaSourceManager mediaSourceManager, ILogger logger, TranscodingJobType transcodingType)
             : base(transcodingType)
         {
@@ -101,75 +106,41 @@ namespace MediaBrowser.Api.Playback
             _logger = logger;
         }
 
-        public bool EstimateContentLength { get; set; }
-        public TranscodeSeekInfo TranscodeSeekInfo { get; set; }
-
-        public bool EnableDlnaHeaders { get; set; }
-
-        public override void Dispose()
+        public override void ReportTranscodingProgress(TimeSpan? transcodingPosition, float framerate, double? percentComplete, long bytesTranscoded, int? bitRate)
         {
-            DisposeTranscodingThrottler();
-            DisposeLogStream();
-            DisposeLiveStream();
-
-            TranscodingJob = null;
+            ApiEntryPoint.Instance.ReportTranscodingProgress(TranscodingJob, this, transcodingPosition, framerate, percentComplete, bytesTranscoded, bitRate);
         }
 
-        private void DisposeTranscodingThrottler()
+        public void Dispose()
         {
-            if (TranscodingThrottler != null)
-            {
-                try
-                {
-                    TranscodingThrottler.Dispose();
-                }
-                catch (Exception ex)
-                {
-                    _logger.LogError(ex, "Error disposing TranscodingThrottler");
-                }
-
-                TranscodingThrottler = null;
-            }
+            Dispose(true);
+            GC.SuppressFinalize(this);
         }
 
-        private void DisposeLogStream()
+        protected virtual void Dispose(bool disposing)
         {
-            if (LogFileStream != null)
+            if (_disposed)
             {
-                try
-                {
-                    LogFileStream.Dispose();
-                }
-                catch (Exception ex)
-                {
-                    _logger.LogError(ex, "Error disposing log stream");
-                }
-
-                LogFileStream = null;
+                return;
             }
-        }
 
-        private async void DisposeLiveStream()
-        {
-            if (MediaSource.RequiresClosing && string.IsNullOrWhiteSpace(Request.LiveStreamId) && !string.IsNullOrWhiteSpace(MediaSource.LiveStreamId))
+            if (disposing)
             {
-                try
-                {
-                    await _mediaSourceManager.CloseLiveStream(MediaSource.LiveStreamId).ConfigureAwait(false);
-                }
-                catch (Exception ex)
+                // REVIEW: Is this the right place for this?
+                if (MediaSource.RequiresClosing
+                    && string.IsNullOrWhiteSpace(Request.LiveStreamId)
+                    && !string.IsNullOrWhiteSpace(MediaSource.LiveStreamId))
                 {
-                    _logger.LogError(ex, "Error closing media source");
+                    _mediaSourceManager.CloseLiveStream(MediaSource.LiveStreamId).GetAwaiter().GetResult();
                 }
+
+                TranscodingThrottler?.Dispose();
             }
-        }
 
-        public DeviceProfile DeviceProfile { get; set; }
+            TranscodingThrottler = null;
+            TranscodingJob = null;
 
-        public TranscodingJob TranscodingJob;
-        public override void ReportTranscodingProgress(TimeSpan? transcodingPosition, float framerate, double? percentComplete, long bytesTranscoded, int? bitRate)
-        {
-            ApiEntryPoint.Instance.ReportTranscodingProgress(TranscodingJob, this, transcodingPosition, framerate, percentComplete, bytesTranscoded, bitRate);
+            _disposed = true;
         }
     }
 }