alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-06-25 17:10:57 +01:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

extracted more logging dependancies

Browse Source
This commit is contained in:
LukePulverenti
2013-02-21 16:06:23 -05:00
parent 2a2ee4adb3
commit 76f067f867
22 changed files with 153 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
MediaBrowser.UI/App.xaml.cs
View File

@@ -7,6 +7,7 @@ using MediaBrowser.Common.UI;
using MediaBrowser.IsoMounter;
using MediaBrowser.Model.Configuration;
using MediaBrowser.Model.Dto;
using MediaBrowser.Model.Logging;
using MediaBrowser.Model.Net;
using MediaBrowser.Model.Weather;
using MediaBrowser.UI.Controller;
@@ -235,16 +236,29 @@ namespace MediaBrowser.UI
[STAThread]
public static void Main()
{
RunApplication<App>("MediaBrowserUI");
var application = new App(LogManager.GetLogger("App"));
application.InitializeComponent();
application.Run();
}
/// <summary>
/// Initializes a new instance of the <see cref="App" /> class.
/// </summary>
/// <param name="logger">The logger.</param>
public App(ILogger logger)
: base(logger)
{
}
/// <summary>
/// Instantiates the kernel.
/// </summary>
/// <returns>IKernel.</returns>
protected override IKernel InstantiateKernel()
{
return new UIKernel(new PismoIsoManager(LogManager.GetLogger("PismoIsoManager")));
return new UIKernel(new PismoIsoManager(Logger), Logger);
}
/// <summary>

5
MediaBrowser.UI/Controller/UIKernel.cs
View File

@@ -3,6 +3,7 @@ using MediaBrowser.Common.IO;
using MediaBrowser.Common.Kernel;
using MediaBrowser.Common.Logging;
using MediaBrowser.Model.Connectivity;
using MediaBrowser.Model.Logging;
using MediaBrowser.Model.Net;
using MediaBrowser.UI.Configuration;
using MediaBrowser.UI.Playback;
@@ -46,8 +47,8 @@ namespace MediaBrowser.UI.Controller
/// <summary>
/// Initializes a new instance of the <see cref="UIKernel" /> class.
/// </summary>
public UIKernel(IIsoManager isoManager)
: base(isoManager)
public UIKernel(IIsoManager isoManager, ILogger logger)
: base(isoManager, logger)
{
Instance = this;
}

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

@@ -31,7 +31,7 @@ namespace MediaBrowser.UI.Playback
public event EventHandler VolumeChanged;
protected void OnVolumeChanged()
{
EventHelper.FireEventIfNotNull(VolumeChanged, this, EventArgs.Empty);
EventHelper.FireEventIfNotNull(VolumeChanged, this, EventArgs.Empty, Logger);
}
#endregion
@@ -42,7 +42,7 @@ namespace MediaBrowser.UI.Playback
public event EventHandler PlayStateChanged;
protected void OnPlayStateChanged()
{
EventHelper.FireEventIfNotNull(PlayStateChanged, this, EventArgs.Empty);
EventHelper.FireEventIfNotNull(PlayStateChanged, this, EventArgs.Empty, Logger);
}
#endregion

4
MediaBrowser.UI/Playback/PlaybackManager.cs
View File

@@ -49,7 +49,7 @@ namespace MediaBrowser.UI.Playback
Options = options,
Player = player,
PlayerConfiguration = playerConfiguration
});
}, Logger);
}
#endregion
@@ -70,7 +70,7 @@ namespace MediaBrowser.UI.Playback
{
Items = items,
Player = player
});
}, Logger);
}
#endregion