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

7 files changed, 73 insertions, 31 deletions

diff --git a/MediaBrowser.Server.Mac.sln b/MediaBrowser.Server.Mac.sln
index a4d850ff4..91d76ca6d 100644
--- a/MediaBrowser.Server.Mac.sln
+++ b/MediaBrowser.Server.Mac.sln
@@ -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

diff --git a/MediaBrowser.Server.Mac.userprefs b/MediaBrowser.Server.Mac.userprefs
index fb3457d9d..4e0fb8a83 100644
--- a/MediaBrowser.Server.Mac.userprefs
+++ b/MediaBrowser.Server.Mac.userprefs
@@ -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">
+        <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="AppDelegate.cs" expanded="True" />
-            <Node name="MainMenu.xib" selected="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>
\ No newline at end of file
diff --git a/MediaBrowser.Server.Mac/AppController.cs b/MediaBrowser.Server.Mac/AppController.cs
index 1823e2152..c500084e2 100644
--- a/MediaBrowser.Server.Mac/AppController.cs
+++ b/MediaBrowser.Server.Mac/AppController.cs
@@ -25,6 +25,7 @@ namespace MediaBrowser.Server.Mac
 		public AppController()
 		{
 			Instance = this;
+			MainClass.AddDependencies (this);
 		}
 
 		public override void AwakeFromNib()
diff --git a/MediaBrowser.Server.Mac/Main.cs b/MediaBrowser.Server.Mac/Main.cs
index 88b9497ea..6b76a63f1 100644
--- a/MediaBrowser.Server.Mac/Main.cs
+++ b/MediaBrowser.Server.Mac/Main.cs
@@ -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);
-		}
-
-		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);
+			var b = true;
+		}
+
+		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);
diff --git a/MediaBrowser.Server.Mac/MediaBrowser.Server.Mac.csproj b/MediaBrowser.Server.Mac/MediaBrowser.Server.Mac.csproj
index 2f6787488..648bdca05 100644
--- a/MediaBrowser.Server.Mac/MediaBrowser.Server.Mac.csproj
+++ b/MediaBrowser.Server.Mac/MediaBrowser.Server.Mac.csproj
@@ -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" />
diff --git a/MediaBrowser.Server.Mac/Native/NativeApp.cs b/MediaBrowser.Server.Mac/Native/NativeApp.cs
new file mode 100644
index 000000000..aedce3d66
--- /dev/null
+++ b/MediaBrowser.Server.Mac/Native/NativeApp.cs
@@ -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();
+		}
+	}
+}
+
diff --git a/MediaBrowser.Server.Mono/Native/NativeApp.cs b/MediaBrowser.Server.Mono/Native/NativeApp.cs
index b71b74a66..d92b86157 100644
--- a/MediaBrowser.Server.Mono/Native/NativeApp.cs
+++ b/MediaBrowser.Server.Mono/Native/NativeApp.cs
@@ -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.