Removed System.Windows.Forms dependancy from Common. Almost done removing NLog dependancy.

5 files changed, 29 insertions, 8 deletions

diff --git a/MediaBrowser.UI/Playback/BaseMediaPlayer.cs b/MediaBrowser.UI/Playback/BaseMediaPlayer.cs
index f635b474d..6e3324b05 100644
--- a/MediaBrowser.UI/Playback/BaseMediaPlayer.cs
+++ b/MediaBrowser.UI/Playback/BaseMediaPlayer.cs
@@ -1,5 +1,4 @@
 using MediaBrowser.Common.Events;
-using MediaBrowser.Common.Logging;
 using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Logging;
 using MediaBrowser.Model.Net;
@@ -212,9 +211,9 @@ namespace MediaBrowser.UI.Playback
         /// <summary>
         /// Initializes a new instance of the <see cref="BaseMediaPlayer" /> class.
         /// </summary>
-        protected BaseMediaPlayer()
+        protected BaseMediaPlayer(ILogger logger)
         {
-            Logger = LogManager.GetLogger(GetType().Name);
+            Logger = logger;
         }
 
         /// <summary>
diff --git a/MediaBrowser.UI/Playback/ExternalPlayer/BaseExternalPlayer.cs b/MediaBrowser.UI/Playback/ExternalPlayer/BaseExternalPlayer.cs
index 0b05a6482..c50911d71 100644
--- a/MediaBrowser.UI/Playback/ExternalPlayer/BaseExternalPlayer.cs
+++ b/MediaBrowser.UI/Playback/ExternalPlayer/BaseExternalPlayer.cs
@@ -1,5 +1,5 @@
-using MediaBrowser.Common.Logging;
-using MediaBrowser.Model.Dto;
+using MediaBrowser.Model.Dto;
+using MediaBrowser.Model.Logging;
 using MediaBrowser.UI.Configuration;
 using MediaBrowser.UI.UserInput;
 using System;
@@ -16,6 +16,10 @@ namespace MediaBrowser.UI.Playback.ExternalPlayer
     /// </summary>
     public abstract class BaseExternalPlayer : BaseMediaPlayer
     {
+        protected BaseExternalPlayer(ILogger logger) : base(logger)
+        {
+        }
+
         /// <summary>
         /// Gets a value indicating whether this instance can mute.
         /// </summary>
diff --git a/MediaBrowser.UI/Playback/ExternalPlayer/GenericExternalPlayer.cs b/MediaBrowser.UI/Playback/ExternalPlayer/GenericExternalPlayer.cs
index 0144ce47a..3efb28d22 100644
--- a/MediaBrowser.UI/Playback/ExternalPlayer/GenericExternalPlayer.cs
+++ b/MediaBrowser.UI/Playback/ExternalPlayer/GenericExternalPlayer.cs
@@ -1,5 +1,6 @@
 using MediaBrowser.Model.Dto;
 using System.ComponentModel.Composition;
+using MediaBrowser.Model.Logging;
 
 namespace MediaBrowser.UI.Playback.ExternalPlayer
 {
@@ -9,6 +10,12 @@ namespace MediaBrowser.UI.Playback.ExternalPlayer
     [Export(typeof(BaseMediaPlayer))]
     public class GenericExternalPlayer : BaseExternalPlayer
     {
+        [ImportingConstructor]
+        public GenericExternalPlayer([Import("logger")] ILogger logger)
+            : base(logger)
+        {
+        }
+
         /// <summary>
         /// Gets the name.
         /// </summary>
diff --git a/MediaBrowser.UI/Playback/InternalPlayer/BaseInternalMediaPlayer.cs b/MediaBrowser.UI/Playback/InternalPlayer/BaseInternalMediaPlayer.cs
index 2ff17b789..e9178d3f5 100644
--- a/MediaBrowser.UI/Playback/InternalPlayer/BaseInternalMediaPlayer.cs
+++ b/MediaBrowser.UI/Playback/InternalPlayer/BaseInternalMediaPlayer.cs
@@ -1,4 +1,5 @@
 using MediaBrowser.Model.Dto;
+using MediaBrowser.Model.Logging;
 using MediaBrowser.UI.Configuration;
 using System.Collections.Generic;
 using System.Windows;
@@ -10,6 +11,10 @@ namespace MediaBrowser.UI.Playback.InternalPlayer
     /// </summary>
     public abstract class BaseInternalMediaPlayer : BaseMediaPlayer
     {
+        protected BaseInternalMediaPlayer(ILogger logger) : base(logger)
+        {
+        }
+
         /// <summary>
         /// Ensures the media player created.
         /// </summary>
diff --git a/MediaBrowser.UI/Playback/NVlc/InternalMediaPlayerNVlc.cs b/MediaBrowser.UI/Playback/NVlc/InternalMediaPlayerNVlc.cs
index 08c9acfcb..7233eb64f 100644
--- a/MediaBrowser.UI/Playback/NVlc/InternalMediaPlayerNVlc.cs
+++ b/MediaBrowser.UI/Playback/NVlc/InternalMediaPlayerNVlc.cs
@@ -1,20 +1,20 @@
-using System.IO;
-using Declarations.Events;
+using Declarations.Events;
 using Declarations.Media;
 using Declarations.Players;
 using Implementation;
 using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Logging;
 using MediaBrowser.UI.Configuration;
 using MediaBrowser.UI.Playback.InternalPlayer;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.Composition;
 using System.Drawing;
+using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 using System.Windows.Forms;
-using MediaState = Declarations.MediaState;
 
 namespace MediaBrowser.UI.Playback.NVlc
 {
@@ -24,6 +24,12 @@ namespace MediaBrowser.UI.Playback.NVlc
     [Export(typeof(BaseMediaPlayer))]
     public class InternalMediaPlayerNVlc : BaseInternalMediaPlayer
     {
+        [ImportingConstructor]
+        public InternalMediaPlayerNVlc([Import("logger")] ILogger logger)
+            : base(logger)
+        {
+        }
+
         /// <summary>
         /// Gets or sets the media player factory.
         /// </summary>