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

3 files changed, 8 insertions, 31 deletions

diff --git a/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj b/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj
index 9df2df2ff..494b89149 100644
--- a/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj
+++ b/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj
@@ -147,7 +147,6 @@
     </Compile>

     <Compile Include="Main.cs" />

     <Compile Include="MenuBarIcon.cs" />

-    <Compile Include="Native\DbConnector.cs" />

     <Compile Include="MacAppHost.cs" />

     <Compile Include="Native\MonoFileSystem.cs" />

     <Compile Include="Native\PowerManagement.cs" />

diff --git a/MediaBrowser.Server.Mac/MacAppHost.cs b/MediaBrowser.Server.Mac/MacAppHost.cs
index 342829c10..78bca03c8 100644
--- a/MediaBrowser.Server.Mac/MacAppHost.cs
+++ b/MediaBrowser.Server.Mac/MacAppHost.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Reflection;
 using Emby.Server.Core;
-using Emby.Server.Core.Data;
 using Emby.Server.Implementations;
 using Emby.Server.Implementations.FFMpeg;
 using MediaBrowser.Model.IO;
@@ -35,6 +34,14 @@ namespace MediaBrowser.Server.Mac
             }
         }
 
+		protected override bool SupportsDualModeSockets
+		{
+			get
+			{
+				return true;
+			}
+		}
+
         protected override FFMpegInstallInfo GetFfmpegInstallInfo()
         {
             var info = new FFMpegInstallInfo();
@@ -95,11 +102,6 @@ namespace MediaBrowser.Server.Mac
             throw new NotImplementedException();
         }
 
-        protected override IDbConnector GetDbConnector()
-        {
-            return new DbConnector(Logger);
-        }
-
         protected override void ConfigureAutoRunInternal(bool autorun)
         {
             throw new NotImplementedException();
diff --git a/MediaBrowser.Server.Mac/Native/DbConnector.cs b/MediaBrowser.Server.Mac/Native/DbConnector.cs
deleted file mode 100644
index 1ef9d2388..000000000
--- a/MediaBrowser.Server.Mac/Native/DbConnector.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using System;
-using System.Data;
-using System.Data.SQLite;
-using System.Threading.Tasks;
-using MediaBrowser.Model.Logging;
-using Emby.Server.Core.Data;
-
-namespace MediaBrowser.Server.Mac
-{
-    public class DbConnector : IDbConnector
-    {
-        private readonly ILogger _logger;
-
-        public DbConnector(ILogger logger)
-        {
-            _logger = logger;
-        }
-
-        public Task<IDbConnection> Connect(string dbPath, bool isReadOnly, bool enablePooling = false, int? cacheSize = null)
-        {
-            return SqliteExtensions.ConnectToDb(dbPath, isReadOnly, enablePooling, cacheSize, _logger);
-        }
-    }
-}
\ No newline at end of file