Merge pull request #651 from jellyfin/release-10.1.0

Release 10.1.0

1 files changed, 18 insertions, 19 deletions

diff --git a/MediaBrowser.Api/ApiEntryPoint.cs b/MediaBrowser.Api/ApiEntryPoint.cs
index ed0a0c81a..8ae0ad942 100644
--- a/MediaBrowser.Api/ApiEntryPoint.cs
+++ b/MediaBrowser.Api/ApiEntryPoint.cs
@@ -1,24 +1,24 @@
-using System;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using MediaBrowser.Api.Playback;
+using MediaBrowser.Common.Configuration;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.MediaEncoding;
 using MediaBrowser.Controller.Net;
 using MediaBrowser.Controller.Plugins;
 using MediaBrowser.Controller.Session;
+using MediaBrowser.Model.Configuration;
 using MediaBrowser.Model.Diagnostics;
+using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.IO;
-using Microsoft.Extensions.Logging;
-using MediaBrowser.Model.Threading;
-using System.Collections.Generic;
-using System.Threading;
-using MediaBrowser.Controller.MediaEncoding;
-using MediaBrowser.Api.Playback;
-using System.IO;
 using MediaBrowser.Model.Session;
-using System.Linq;
-using System.Threading.Tasks;
-using MediaBrowser.Model.Dto;
-using MediaBrowser.Model.Configuration;
-using MediaBrowser.Common.Configuration;
+using MediaBrowser.Model.Threading;
+using Microsoft.Extensions.Logging;
 
 namespace MediaBrowser.Api
 {
@@ -101,8 +101,7 @@ namespace MediaBrowser.Api
         {
             lock (_transcodingLocks)
             {
-                SemaphoreSlim result;
-                if (!_transcodingLocks.TryGetValue(outputPath, out result))
+                if (!_transcodingLocks.TryGetValue(outputPath, out SemaphoreSlim result))
                 {
                     result = new SemaphoreSlim(1, 1);
                     _transcodingLocks[outputPath] = result;
@@ -388,7 +387,7 @@ namespace MediaBrowser.Api
         {
             if (string.IsNullOrEmpty(playSessionId))
             {
-                throw new ArgumentNullException("playSessionId");
+                throw new ArgumentNullException(nameof(playSessionId));
             }
 
             //Logger.LogDebug("PingTranscodingJob PlaySessionId={0} isUsedPaused: {1}", playSessionId, isUserPaused);
@@ -397,7 +396,7 @@ namespace MediaBrowser.Api
 
             lock (_activeTranscodingJobs)
             {
-                // This is really only needed for HLS. 
+                // This is really only needed for HLS.
                 // Progressive streams can stop on their own reliably
                 jobs = _activeTranscodingJobs.Where(j => string.Equals(playSessionId, j.PlaySessionId, StringComparison.OrdinalIgnoreCase)).ToList();
             }
@@ -499,7 +498,7 @@ namespace MediaBrowser.Api
 
             lock (_activeTranscodingJobs)
             {
-                // This is really only needed for HLS. 
+                // This is really only needed for HLS.
                 // Progressive streams can stop on their own reliably
                 jobs.AddRange(_activeTranscodingJobs.Where(killJob));
             }
@@ -681,7 +680,7 @@ namespace MediaBrowser.Api
         }
     }
 
-        /// <summary>
+    /// <summary>
     /// Class TranscodingJob
     /// </summary>
     public class TranscodingJob