alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-04-22 01:54:42 +01:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

updates for mac project

Browse Source
This commit is contained in:
Luke
2014-11-28 12:40:20 -05:00
parent 9875c3a7e9
commit cc2d04d5bc
9 changed files with 283 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
MediaBrowser.Server.Mac/Main.cs
View File

@@ -18,7 +18,6 @@ using MediaBrowser.Server.Implementations;
using MediaBrowser.Server.Startup.Common;
using MediaBrowser.Server.Startup.Common.Browser;
using Microsoft.Win32;
using Microsoft.Win32;
using MonoMac.AppKit;
using MonoMac.Foundation;
using MonoMac.ObjCRuntime;
@@ -57,7 +56,7 @@ namespace MediaBrowser.Server.Mac
NSApplication.Main (args);
}
public static void AddDependencies(AppController appController){
public static void AddDependencies(MenuBarIcon appController){
appController.AppHost = _appHost;
appController.Logger = _logger;
appController.ConfigurationManager = _appHost.ServerConfigurationManager;
@@ -106,13 +105,16 @@ namespace MediaBrowser.Server.Mac
Console.WriteLine ("appHost.Init");
Task.Run (() => StartServer(CancellationToken.None));
}
private static async void StartServer(CancellationToken cancellationToken)
{
var initProgress = new Progress<double>();
var task = _appHost.Init(initProgress);
await _appHost.Init (initProgress).ConfigureAwait (false);
Task.WaitAll(task);
Task.Run (() => _appHost.RunStartupTasks());
//await _appHost.RunStartupTasks ().ConfigureAwait (false);
}
/// <summary>
@@ -139,7 +141,7 @@ namespace MediaBrowser.Server.Mac
_appHost.Dispose ();
_logger.Info("AppController.Terminate");
AppController.Instance.Terminate ();
MenuBarIcon.Instance.Terminate ();
}
/// <summary>