From 010cf2340aca8f21d90fd9c8c8653b9b8d7208b2 Mon Sep 17 00:00:00 2001
From: Patrick Barron <barronpm@gmail.com>
Date: Wed, 11 Oct 2023 11:12:33 -0400
Subject: [PATCH] Use DI for MediaReceiverRegistrarService

---
 .../Extensions/DlnaServiceCollectionExtensions.cs   |  2 ++
 Emby.Dlna/Main/DlnaEntryPoint.cs                    | 13 -------------
 Jellyfin.Api/Controllers/DlnaServerController.cs    |  7 ++++---
 3 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/Emby.Dlna/Extensions/DlnaServiceCollectionExtensions.cs b/Emby.Dlna/Extensions/DlnaServiceCollectionExtensions.cs
index f8ed00aeaf..8361cc7e78 100644
--- a/Emby.Dlna/Extensions/DlnaServiceCollectionExtensions.cs
+++ b/Emby.Dlna/Extensions/DlnaServiceCollectionExtensions.cs
@@ -5,6 +5,7 @@ using System.Net.Http;
 using System.Text;
 using Emby.Dlna.ConnectionManager;
 using Emby.Dlna.ContentDirectory;
+using Emby.Dlna.MediaReceiverRegistrar;
 using Emby.Dlna.Ssdp;
 using MediaBrowser.Common.Net;
 using MediaBrowser.Controller;
@@ -52,5 +53,6 @@ public static class DlnaServiceCollectionExtensions
         services.AddSingleton<IDeviceDiscovery, DeviceDiscovery>();
         services.AddSingleton<IContentDirectory, ContentDirectoryService>();
         services.AddSingleton<IConnectionManager, ConnectionManagerService>();
+        services.AddSingleton<IMediaReceiverRegistrar, MediaReceiverRegistrarService>();
     }
 }
diff --git a/Emby.Dlna/Main/DlnaEntryPoint.cs b/Emby.Dlna/Main/DlnaEntryPoint.cs
index a22143ae7b..ea996a4424 100644
--- a/Emby.Dlna/Main/DlnaEntryPoint.cs
+++ b/Emby.Dlna/Main/DlnaEntryPoint.cs
@@ -94,12 +94,6 @@ namespace Emby.Dlna.Main
             _networkManager = networkManager;
             _logger = loggerFactory.CreateLogger<DlnaEntryPoint>();
 
-            MediaReceiverRegistrar = new MediaReceiverRegistrar.MediaReceiverRegistrarService(
-                loggerFactory.CreateLogger<MediaReceiverRegistrar.MediaReceiverRegistrarService>(),
-                httpClientFactory,
-                config);
-            Current = this;
-
             var netConfig = config.GetConfiguration<NetworkConfiguration>(NetworkConfigurationStore.StoreKey);
             _disabled = appHost.ListenWithHttps && netConfig.RequireHttps;
 
@@ -109,15 +103,11 @@ namespace Emby.Dlna.Main
             }
         }
 
-        public static DlnaEntryPoint Current { get; private set; }
-
         /// <summary>
         /// Gets a value indicating whether the dlna server is enabled.
         /// </summary>
         public static bool Enabled { get; private set; }
 
-        public IMediaReceiverRegistrar MediaReceiverRegistrar { get; private set; }
-
         public async Task RunAsync()
         {
             await ((DlnaManager)_dlnaManager).InitProfilesAsync().ConfigureAwait(false);
@@ -425,9 +415,6 @@ namespace Emby.Dlna.Main
                 _communicationsServer = null;
             }
 
-            MediaReceiverRegistrar = null;
-            Current = null;
-
             _disposed = true;
         }
     }
diff --git a/Jellyfin.Api/Controllers/DlnaServerController.cs b/Jellyfin.Api/Controllers/DlnaServerController.cs
index 2d52097c04..42576934b3 100644
--- a/Jellyfin.Api/Controllers/DlnaServerController.cs
+++ b/Jellyfin.Api/Controllers/DlnaServerController.cs
@@ -5,7 +5,6 @@ using System.IO;
 using System.Net.Mime;
 using System.Threading.Tasks;
 using Emby.Dlna;
-using Emby.Dlna.Main;
 using Jellyfin.Api.Attributes;
 using Jellyfin.Api.Constants;
 using MediaBrowser.Controller.Dlna;
@@ -35,15 +34,17 @@ public class DlnaServerController : BaseJellyfinApiController
     /// <param name="dlnaManager">Instance of the <see cref="IDlnaManager"/> interface.</param>
     /// <param name="contentDirectory">Instance of the <see cref="IContentDirectory"/> interface.</param>
     /// <param name="connectionManager">Instance of the <see cref="IConnectionManager"/> interface.</param>
+    /// <param name="mediaReceiverRegistrar">Instance of the <see cref="IMediaReceiverRegistrar"/> interface.</param>
     public DlnaServerController(
         IDlnaManager dlnaManager,
         IContentDirectory contentDirectory,
-        IConnectionManager connectionManager)
+        IConnectionManager connectionManager,
+        IMediaReceiverRegistrar mediaReceiverRegistrar)
     {
         _dlnaManager = dlnaManager;
         _contentDirectory = contentDirectory;
         _connectionManager = connectionManager;
-        _mediaReceiverRegistrar = DlnaEntryPoint.Current.MediaReceiverRegistrar;
+        _mediaReceiverRegistrar = mediaReceiverRegistrar;
     }
 
     /// <summary>