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

2 files changed, 30 insertions, 6 deletions

diff --git a/MediaBrowser.Server.Mac/Native/BaseMonoApp.cs b/MediaBrowser.Server.Mac/Native/BaseMonoApp.cs
index 67ad96859..0b2f533a4 100644
--- a/MediaBrowser.Server.Mac/Native/BaseMonoApp.cs
+++ b/MediaBrowser.Server.Mac/Native/BaseMonoApp.cs
@@ -7,6 +7,7 @@ using System.Collections.Generic;
 using System.Reflection;
 using System.Text.RegularExpressions;
 using MediaBrowser.Controller.Power;
+using MediaBrowser.Server.Implementations.Persistence;
 using MediaBrowser.Server.Startup.Common.FFMpeg;
 using System.Diagnostics;
 
@@ -14,6 +15,13 @@ namespace MediaBrowser.Server.Mac
 {
     public abstract class BaseMonoApp : INativeApp
     {
+        protected ILogger Logger { get; private set; }
+
+        protected BaseMonoApp(ILogger logger)
+        {
+            Logger = logger;
+        }
+
         /// <summary>
         /// Shutdowns this instance.
         /// </summary>
@@ -39,6 +47,21 @@ namespace MediaBrowser.Server.Mac
             }
         }
 
+        public void PreventSystemStandby()
+        {
+
+        }
+
+        public void AllowSystemStandby()
+        {
+
+        }
+        
+        public IDbConnector GetDbConnector()
+        {
+            return new DbConnector(Logger);
+        }
+
 		public virtual bool SupportsLibraryMonitor
 		{
 			get
@@ -64,11 +87,6 @@ namespace MediaBrowser.Server.Mac
             get { return false; }
         }
 
-        public void PreventSystemStandby()
-        {
-
-        }
-
         public List<Assembly> GetAssembliesWithParts()
         {
             var list = new List<Assembly>();
diff --git a/MediaBrowser.Server.Mac/Native/NativeApp.cs b/MediaBrowser.Server.Mac/Native/NativeApp.cs
index 005fb0914..59fa92dd1 100644
--- a/MediaBrowser.Server.Mac/Native/NativeApp.cs
+++ b/MediaBrowser.Server.Mac/Native/NativeApp.cs
@@ -1,5 +1,6 @@
 using System;
 using MediaBrowser.Server.Startup.Common;
+using MediaBrowser.Model.Logging;
 
 namespace MediaBrowser.Server.Mac
 {
@@ -8,7 +9,12 @@ namespace MediaBrowser.Server.Mac
 	/// </summary>
 	public class NativeApp : BaseMonoApp
 	{
-		/// <summary>
+		public NativeApp(ILogger logger)
+	            : base(logger)
+	        {
+	        }
+
+        /// <summary>
 		/// Shutdowns this instance.
 		/// </summary>
 		public override void Shutdown()