alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-05-25 10:07:15 +01:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
LukePulverenti
2013-02-21 20:26:35 -05:00
parent 931c0ea455
commit fdafa59683
88 changed files with 1025 additions and 767 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
MediaBrowser.UI/Playback/BaseMediaPlayer.cs
View File

@@ -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>

8
MediaBrowser.UI/Playback/ExternalPlayer/BaseExternalPlayer.cs
View File

@@ -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>

7
MediaBrowser.UI/Playback/ExternalPlayer/GenericExternalPlayer.cs
View File

@@ -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>

5
MediaBrowser.UI/Playback/InternalPlayer/BaseInternalMediaPlayer.cs
View File

@@ -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>

12
MediaBrowser.UI/Playback/NVlc/InternalMediaPlayerNVlc.cs
View File

@@ -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>