Merge branch 'master' into bhowe34/fix-replace-missing-metadata-for-music

1 files changed, 4 insertions, 3 deletions

diff --git a/MediaBrowser.Controller/MediaEncoding/ITranscodeManager.cs b/MediaBrowser.Controller/MediaEncoding/ITranscodeManager.cs
index c19a12ae7..09bc01f74 100644
--- a/MediaBrowser.Controller/MediaEncoding/ITranscodeManager.cs
+++ b/MediaBrowser.Controller/MediaEncoding/ITranscodeManager.cs
@@ -96,9 +96,10 @@ public interface ITranscodeManager
     public void OnTranscodeEndRequest(TranscodingJob job);
 
     /// <summary>
-    /// Gets the transcoding lock.
+    /// Transcoding lock.
     /// </summary>
     /// <param name="outputPath">The output path of the transcoded file.</param>
-    /// <returns>A <see cref="SemaphoreSlim"/>.</returns>
-    public SemaphoreSlim GetTranscodingLock(string outputPath);
+    /// <param name="cancellationToken">The cancellation token.</param>
+    /// <returns>An <see cref="IDisposable"/>.</returns>
+    ValueTask<IDisposable> LockAsync(string outputPath, CancellationToken cancellationToken);
 }