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

Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

Browse Source
This commit is contained in:
Luke Pulverenti 2014-11-26 14:30:04 -05:00
commit 43ce443832
7 changed files with 74 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
MediaBrowser.Server.Mac.sln
View File

@ -286,13 +286,14 @@ Global
{C97B98FA-00D4-4880-88B8-C76017A418AB}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(MonoDevelopProperties) = preSolution
StartupItem = MediaBrowser.Server.Mac\MediaBrowser.Server.Mac.csproj
Policies = $0
$0.DotNetNamingPolicy = $1
$1.DirectoryNamespaceAssociation = None
$1.ResourceNamePolicy = FileFormatDefault
$0.VersionControlPolicy = $2
$2.inheritsSet = Mono
StartupItems = $0
$0.Item = MediaBrowser.Server.Mac\MediaBrowser.Server.Mac.csproj
Policies = $1
$1.DotNetNamingPolicy = $2
$2.DirectoryNamespaceAssociation = None
$2.ResourceNamePolicy = FileFormatDefault
$1.VersionControlPolicy = $3
$3.inheritsSet = Mono
version =
EndGlobalSection
EndGlobal

42
MediaBrowser.Server.Mac.userprefs
View File

@ -1,24 +1,46 @@
<Properties>
<MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
<MonoDevelop.Ide.Workbench ActiveDocument="MediaBrowser.Server.Mac/AppController.cs">
<MonoDevelop.Ide.Workspace ActiveConfiguration="Release" />
<MonoDevelop.Ide.Workbench ActiveDocument="MediaBrowser.Server.Mac/Main.cs">
<Files>
<File FileName="MediaBrowser.Server.Mac/MainWindowController.cs" Line="1" Column="1" />
<File FileName="MediaBrowser.Server.Mac/AppDelegate.cs" Line="4" Column="4" />
<File FileName="MediaBrowser.Server.Mac/AppController.cs" Line="14" Column="14" />
<File FileName="MediaBrowser.Server.Mac/AppController.cs" Line="4" Column="4" />
<File FileName="MediaBrowser.Server.Mac/Main.cs" Line="4" Column="4" />
<File FileName="MediaBrowser.Common.Implementations/BaseApplicationPaths.cs" Line="13" Column="13" />
<File FileName="MediaBrowser.Server.Mac/app.config" Line="56" Column="56" />
<File FileName="MediaBrowser.WebDashboard/Api/PackageCreator.cs" Line="99" Column="99" />
<File FileName="MediaBrowser.Server.Mac/EmptyXmlFile.xml" Line="1" Column="1" />
<File FileName="MediaBrowser.Server.Mono/Program.cs" Line="9" Column="9" />
<File FileName="MediaBrowser.Server.Mac/AppDelegate.cs" Line="1" Column="1" />
<File FileName="MediaBrowser.Server.Mono/Networking/NetworkManager.cs" Line="1" Column="1" />
<File FileName="MediaBrowser.Server.Mono/Native/NativeApp.cs" Line="37" Column="37" />
</Files>
<Pads>
<Pad Id="ProjectPad">
<State expanded="True">
<Node name="MediaBrowser.Server.Mac" expanded="True">
<Node name="AppDelegate.cs" expanded="True" />
<Node name="MainMenu.xib" selected="True" />
<State expanded="True" selected="True">
<Node name="MediaBrowser.Common.Implementations" expanded="True">
<Node name="Devices" expanded="True" />
</Node>
<Node name="MediaBrowser.Server.Implementations" expanded="True" />
<Node name="MediaBrowser.Server.Mac" expanded="True">
<Node name="Native" expanded="True" />
</Node>
<Node name="MediaBrowser.Server.Mono" expanded="True">
<Node name="Networking" expanded="True" />
</Node>
<Node name="MediaBrowser.Server.Startup.Common" expanded="True" />
<Node name="MediaBrowser.WebDashboard" expanded="True">
<Node name="Api" expanded="True" />
</Node>
<Node name="MediaBrowser.XbmcMetadata" expanded="True" />
<Node name="OpenSubtitlesHandler" expanded="True" />
</State>
</Pad>
</Pads>
</MonoDevelop.Ide.Workbench>
<MonoDevelop.Ide.DebuggingService.Breakpoints>
<BreakpointStore />
<BreakpointStore>
<Breakpoint file="/Users/luke/MediaBrowser/MediaBrowser.Server.Mac/Main.cs" line="58" column="1" />
<Breakpoint file="/Users/luke/MediaBrowser/MediaBrowser.Common.Implementations/BaseApplicationPaths.cs" line="233" column="1" />
</BreakpointStore>
</MonoDevelop.Ide.DebuggingService.Breakpoints>
<MonoDevelop.Ide.DebuggingService.PinnedWatches />
</Properties>

1
MediaBrowser.Server.Mac/AppController.cs
View File

@ -25,6 +25,7 @@ namespace MediaBrowser.Server.Mac
public AppController()
{
Instance = this;
MainClass.AddDependencies (this);
}
public override void AwakeFromNib()

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

@ -15,7 +15,6 @@ using MediaBrowser.Common.Implementations.IO;
using MediaBrowser.Common.Implementations.Logging;
using MediaBrowser.Model.Logging;
using MediaBrowser.Server.Implementations;
using MediaBrowser.Server.Mono.Native;
using MediaBrowser.Server.Startup.Common;
using MediaBrowser.Server.Startup.Common.Browser;
using Microsoft.Win32;
@ -54,26 +53,23 @@ namespace MediaBrowser.Server.Mac
AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException;
StartApplication(appPaths, logManager, options);
RunNSApp (args);
NSApplication.Init ();
NSApplication.Main (args);
var b = true;
}
private static void RunNSApp(string[] args) {
NSApplication.Init ();
AppController.Instance.AppHost = _appHost;
AppController.Instance.Logger = _logger;
AppController.Instance.ConfigurationManager = _appHost.ServerConfigurationManager;
AppController.Instance.Localization = _appHost.LocalizationManager;
NSApplication.Main (args);
public static void AddDependencies(AppController appController){
appController.AppHost = _appHost;
appController.Logger = _logger;
appController.ConfigurationManager = _appHost.ServerConfigurationManager;
appController.Localization = _appHost.LocalizationManager;
}
private static ServerApplicationPaths CreateApplicationPaths(string applicationPath, string programDataPath)
{
if (string.IsNullOrEmpty(programDataPath))
{
return new ServerApplicationPaths(applicationPath);
programDataPath = Path.Combine(Environment.GetFolderPath (Environment.SpecialFolder.ApplicationData), "mediabrowser");
}
return new ServerApplicationPaths(programDataPath, applicationPath);

4
MediaBrowser.Server.Mac/MediaBrowser.Server.Mac.csproj
View File

@ -72,9 +72,9 @@
</ItemGroup>
<ItemGroup>
<Folder Include="Resources\" />
<Folder Include="Native\" />
</ItemGroup>
<ItemGroup>
<Compile Include="Main.cs" />
<Compile Include="AppDelegate.cs" />
<Compile Include="AppDelegate.designer.cs">
<DependentUpon>AppDelegate.cs</DependentUpon>
@ -83,6 +83,8 @@
<Compile Include="AppController.designer.cs">
<DependentUpon>AppController.cs</DependentUpon>
</Compile>
<Compile Include="Main.cs" />
<Compile Include="Native\NativeApp.cs" />
</ItemGroup>
<ItemGroup>
<InterfaceDefinition Include="MainMenu.xib" />

20
MediaBrowser.Server.Mac/Native/NativeApp.cs Normal file
View File

@ -0,0 +1,20 @@
using System;
using MediaBrowser.Server.Mono.Native;
namespace MediaBrowser.Server.Mac
{
/// <summary>
/// Class NativeApp
/// </summary>
public class NativeApp : BaseMonoApp
{
/// <summary>
/// Shutdowns this instance.
/// </summary>
public override void Shutdown()
{
MainClass.Shutdown();
}
}
}

2
MediaBrowser.Server.Mono/Native/NativeApp.cs
View File

@ -4,7 +4,7 @@ namespace MediaBrowser.Server.Mono.Native
/// <summary>
/// Class NativeApp
/// </summary>
public class NativeApp : BaseMonoApp
internal class NativeApp : BaseMonoApp
{
/// <summary>
/// Shutdowns this instance.