Merge remote-tracking branch 'upstream/master' into client-logger

1 files changed, 32 insertions, 1 deletions

diff --git a/Jellyfin.Api/Models/PlaybackDtos/TranscodingJobDto.cs b/Jellyfin.Api/Models/PlaybackDtos/TranscodingJobDto.cs
index 9edc19bb6..fed837b85 100644
--- a/Jellyfin.Api/Models/PlaybackDtos/TranscodingJobDto.cs
+++ b/Jellyfin.Api/Models/PlaybackDtos/TranscodingJobDto.cs
@@ -11,7 +11,7 @@ namespace Jellyfin.Api.Models.PlaybackDtos
     /// <summary>
     /// Class TranscodingJob.
     /// </summary>
-    public class TranscodingJobDto
+    public class TranscodingJobDto : IDisposable
     {
         /// <summary>
         /// The process lock.
@@ -107,6 +107,11 @@ namespace Jellyfin.Api.Models.PlaybackDtos
         public bool HasExited { get; set; }
 
         /// <summary>
+        /// Gets or sets exit code.
+        /// </summary>
+        public int ExitCode { get; set; }
+
+        /// <summary>
         /// Gets or sets a value indicating whether is user paused.
         /// </summary>
         public bool IsUserPaused { get; set; }
@@ -249,5 +254,31 @@ namespace Jellyfin.Api.Models.PlaybackDtos
                 }
             }
         }
+
+        /// <inheritdoc />
+        public void Dispose()
+        {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        /// <summary>
+        /// Dispose all resources.
+        /// </summary>
+        /// <param name="disposing">Whether to dispose all resources.</param>
+        protected virtual void Dispose(bool disposing)
+        {
+            if (disposing)
+            {
+                Process?.Dispose();
+                Process = null;
+                KillTimer?.Dispose();
+                KillTimer = null;
+                CancellationTokenSource?.Dispose();
+                CancellationTokenSource = null;
+                TranscodingThrottler?.Dispose();
+                TranscodingThrottler = null;
+            }
+        }
     }
 }