From 7b31b0e322332690fa9bda7d16a5f9a0cdeffa8d Mon Sep 17 00:00:00 2001
From: Mark Monteiro <marknr.monteiro@protonmail.com>
Date: Sat, 4 Apr 2020 15:33:23 -0400
Subject: [PATCH] Inject logger correctly into ActivityManager and
 ActivityRepository

---
 Emby.Server.Implementations/Activity/ActivityManager.cs    | 4 ++--
 Emby.Server.Implementations/Activity/ActivityRepository.cs | 4 ++--
 MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs    | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Emby.Server.Implementations/Activity/ActivityManager.cs b/Emby.Server.Implementations/Activity/ActivityManager.cs
index ee10845cf..34ccd4bba 100644
--- a/Emby.Server.Implementations/Activity/ActivityManager.cs
+++ b/Emby.Server.Implementations/Activity/ActivityManager.cs
@@ -18,11 +18,11 @@ namespace Emby.Server.Implementations.Activity
         private readonly IUserManager _userManager;
 
         public ActivityManager(
-            ILoggerFactory loggerFactory,
+            ILogger<ActivityManager> logger,
             IActivityRepository repo,
             IUserManager userManager)
         {
-            _logger = loggerFactory.CreateLogger(nameof(ActivityManager));
+            _logger = logger;
             _repo = repo;
             _userManager = userManager;
         }
diff --git a/Emby.Server.Implementations/Activity/ActivityRepository.cs b/Emby.Server.Implementations/Activity/ActivityRepository.cs
index 7be72319e..0fd262521 100644
--- a/Emby.Server.Implementations/Activity/ActivityRepository.cs
+++ b/Emby.Server.Implementations/Activity/ActivityRepository.cs
@@ -20,8 +20,8 @@ namespace Emby.Server.Implementations.Activity
         private static readonly CultureInfo _usCulture = CultureInfo.ReadOnly(new CultureInfo("en-US"));
         private readonly IFileSystem _fileSystem;
 
-        public ActivityRepository(ILoggerFactory loggerFactory, IServerApplicationPaths appPaths, IFileSystem fileSystem)
-            : base(loggerFactory.CreateLogger(nameof(ActivityRepository)))
+        public ActivityRepository(ILogger<ActivityRepository> logger, IServerApplicationPaths appPaths, IFileSystem fileSystem)
+            : base(logger)
         {
             DbFilePath = Path.Combine(appPaths.DataPath, "activitylog.db");
             _fileSystem = fileSystem;
diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
index ce576a6c3..42379c73b 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
@@ -471,7 +471,7 @@ namespace MediaBrowser.Controller.MediaEncoding
             {
                 var videoDecoder = GetHardwareAcceleratedVideoDecoder(state, encodingOptions);
                 var outputVideoCodec = GetVideoEncoder(state, encodingOptions);
-				
+                
                 var hasTextSubs = state.SubtitleStream != null && state.SubtitleStream.IsTextSubtitleStream && state.SubtitleDeliveryMethod == SubtitleDeliveryMethod.Encode;
 
                 if (!hasTextSubs)