lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1226 from MediaBrowser/master

Browse Source 
Merge from master
This commit is contained in:
Luke 2015-10-27 13:27:11 -04:00
commit 1d96b92c08
4 changed files with 651 additions and 166 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

773
MediaBrowser.Server.Mac/Emby.Server.Mac.csproj
View File

File diff suppressed because it is too large Load Diff

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

@ -21,6 +21,8 @@ using Microsoft.Win32;
using MonoMac.AppKit;
using MonoMac.Foundation;
using MonoMac.ObjCRuntime;
using CommonIO;
using MediaBrowser.Server.Implementations.Logging;
namespace MediaBrowser.Server.Mac
{
@ -89,7 +91,7 @@ namespace MediaBrowser.Server.Mac
// Allow all https requests
ServicePointManager.ServerCertificateValidationCallback = new RemoteCertificateValidationCallback(delegate { return true; });
var fileSystem = new CommonFileSystem(logManager.GetLogger("FileSystem"), false, true);
var fileSystem = new ManagedFileSystem(new PatternsLogger(logManager.GetLogger("FileSystem")), false, true);
var nativeApp = new NativeApp();

32
MediaBrowser.Server.Mac/MenuBarIcon.cs
View File

@ -13,10 +13,7 @@ namespace MediaBrowser.Server.Mac
{
private NSMenuItem browseMenuItem;
private NSMenuItem configureMenuItem;
private NSMenuItem developerMenuItem;
private NSMenuItem quitMenuItem;
private NSMenuItem githubMenuItem;
private NSMenuItem apiMenuItem;
private NSMenuItem communityMenuItem;
public static MenuBarIcon Instance;
@ -71,22 +68,6 @@ namespace MediaBrowser.Server.Mac
});
menu.AddItem (configureMenuItem);
developerMenuItem = new NSMenuItem ("Developer Resources");
menu.AddItem (developerMenuItem);
var developerMenu = new NSMenu ();
developerMenuItem.Submenu = developerMenu;
apiMenuItem = new NSMenuItem ("Api Documentation", "a", delegate {
ApiDocs (NSApplication.SharedApplication);
});
developerMenu.AddItem (apiMenuItem);
githubMenuItem = new NSMenuItem ("Github", "g", delegate {
Github (NSApplication.SharedApplication);
});
developerMenu.AddItem (githubMenuItem);
communityMenuItem = new NSMenuItem ("Visit Community", "v", delegate {
Community (NSApplication.SharedApplication);
});
@ -120,16 +101,6 @@ namespace MediaBrowser.Server.Mac
BrowserLauncher.OpenWebClient(MainClass.AppHost, Logger);
}
private void Github(NSObject sender)
{
BrowserLauncher.OpenGithub(Logger);
}
private void ApiDocs(NSObject sender)
{
BrowserLauncher.OpenSwagger(MainClass.AppHost, Logger);
}
public void Terminate()
{
NSApplication.SharedApplication.InvokeOnMainThread (() => NSApplication.SharedApplication.Terminate(NSApplication.SharedApplication));
@ -167,9 +138,6 @@ namespace MediaBrowser.Server.Mac
quitMenuItem.Title = localization.GetLocalizedString("LabelExit");
communityMenuItem.Title = localization.GetLocalizedString("LabelVisitCommunity");
githubMenuItem.Title = localization.GetLocalizedString("LabelGithub");
apiMenuItem.Title = localization.GetLocalizedString("LabelApiDocumentation");
developerMenuItem.Title = localization.GetLocalizedString("LabelDeveloperResources");
browseMenuItem.Title = localization.GetLocalizedString("LabelBrowseLibrary");
configureMenuItem.Title = localization.GetLocalizedString("LabelConfigureMediaBrowser");
}

8
MediaBrowser.Server.Mac/Native/BaseMonoApp.cs
View File

@ -36,6 +36,14 @@ namespace MediaBrowser.Server.Mac
}
}
public virtual bool SupportsLibraryMonitor
{
get
{
return false;
}
}
/// <summary>
/// Gets a value indicating whether this instance can self update.
/// </summary>