Merge pull request #419 from jellyfin/dev

Master 10.0.0

1 files changed, 11 insertions, 11 deletions

diff --git a/MediaBrowser.Controller/Session/SessionInfo.cs b/MediaBrowser.Controller/Session/SessionInfo.cs
index 869d3fcb0..77e786ead 100644
--- a/MediaBrowser.Controller/Session/SessionInfo.cs
+++ b/MediaBrowser.Controller/Session/SessionInfo.cs
@@ -1,11 +1,11 @@
-using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Entities;
 using MediaBrowser.Model.Dto;
-using MediaBrowser.Model.Logging;
 using MediaBrowser.Model.Serialization;
 using MediaBrowser.Model.Session;
+using System;
+using Microsoft.Extensions.Logging;
 using MediaBrowser.Model.Threading;
 using System.Linq;
-using System;
 
 namespace MediaBrowser.Controller.Session
 {
@@ -22,9 +22,9 @@ namespace MediaBrowser.Controller.Session
             _sessionManager = sessionManager;
             _logger = logger;
 
-            AdditionalUsers = new SessionUserInfo[] { };
+            AdditionalUsers = Array.Empty<SessionUserInfo>();
             PlayState = new PlayerStateInfo();
-            SessionControllers = new ISessionController[] { };
+            SessionControllers = Array.Empty<ISessionController>();
         }
 
         public PlayerStateInfo PlayState { get; set; }
@@ -49,7 +49,7 @@ namespace MediaBrowser.Controller.Session
             {
                 if (Capabilities == null)
                 {
-                    return new string[] {};
+                    return Array.Empty<string>();
                 }
                 return Capabilities.PlayableMediaTypes;
             }
@@ -231,7 +231,7 @@ namespace MediaBrowser.Controller.Session
             }
 
             var newController = factory(this);
-            _logger.Debug("Creating new {0}", newController.GetType().Name);
+            _logger.LogDebug("Creating new {0}", newController.GetType().Name);
             controllers.Add(newController);
 
             SessionControllers = controllers.ToArray();
@@ -337,7 +337,7 @@ namespace MediaBrowser.Controller.Session
             }
             catch (Exception ex)
             {
-                _logger.ErrorException("Error reporting playback progress", ex);
+                _logger.LogError(ex, "Error reporting playback progress");
             }
         }
 
@@ -363,7 +363,7 @@ namespace MediaBrowser.Controller.Session
             StopAutomaticProgress();
 
             var controllers = SessionControllers.ToList();
-            SessionControllers = new ISessionController[] { };
+            SessionControllers = Array.Empty<ISessionController>();
 
             foreach (var controller in controllers)
             {
@@ -371,7 +371,7 @@ namespace MediaBrowser.Controller.Session
 
                 if (disposable != null)
                 {
-                    _logger.Debug("Disposing session controller {0}", disposable.GetType().Name);
+                    _logger.LogDebug("Disposing session controller {0}", disposable.GetType().Name);
 
                     try
                     {
@@ -379,7 +379,7 @@ namespace MediaBrowser.Controller.Session
                     }
                     catch (Exception ex)
                     {
-                        _logger.ErrorException("Error disposing session controller", ex);
+                        _logger.LogError(ex, "Error disposing session controller");
                     }
                 }
             }