Merge pull request #2488 from MediaBrowser/dev

Dev

6 files changed, 56 insertions, 53 deletions

diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
index 8407948cf..4e1a0a8d7 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
@@ -1486,7 +1486,7 @@ namespace MediaBrowser.Controller.MediaEncoding
                     }
                 }
 
-                if (state.RunTimeTicks.HasValue)
+                if (state.RunTimeTicks.HasValue && string.IsNullOrWhiteSpace(encodingOptions.HardwareAccelerationType))
                 {
                     foreach (var stream in state.MediaSource.MediaStreams)
                     {
diff --git a/MediaBrowser.Server.Mac.sln b/MediaBrowser.Server.Mac.sln
index 9b04284c3..037cd488b 100644
--- a/MediaBrowser.Server.Mac.sln
+++ b/MediaBrowser.Server.Mac.sln
@@ -49,8 +49,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RSSDP", "RSSDP\RSSDP.csproj
 EndProject

 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SocketHttpListener.Portable", "SocketHttpListener.Portable\SocketHttpListener.Portable.csproj", "{4F26D5D8-A7B0-42B3-BA42-7CB7D245934E}"

 EndProject

-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceStack", "ServiceStack\ServiceStack.csproj", "{680A1709-25EB-4D52-A87F-EE03FFD94BAA}"

-EndProject

 Global

 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

 		AppStore|Any CPU = AppStore|Any CPU

@@ -522,26 +520,6 @@ Global
 		{4F26D5D8-A7B0-42B3-BA42-7CB7D245934E}.Signed|Any CPU.Build.0 = Release|Any CPU

 		{4F26D5D8-A7B0-42B3-BA42-7CB7D245934E}.Signed|x86.ActiveCfg = Release|Any CPU

 		{4F26D5D8-A7B0-42B3-BA42-7CB7D245934E}.Signed|x86.Build.0 = Release|Any CPU

-		{680A1709-25EB-4D52-A87F-EE03FFD94BAA}.AppStore|Any CPU.ActiveCfg = Signed|Any CPU

-		{680A1709-25EB-4D52-A87F-EE03FFD94BAA}.AppStore|Any CPU.Build.0 = Signed|Any CPU

-		{680A1709-25EB-4D52-A87F-EE03FFD94BAA}.AppStore|x86.ActiveCfg = Signed|Any CPU

-		{680A1709-25EB-4D52-A87F-EE03FFD94BAA}.AppStore|x86.Build.0 = Signed|Any CPU

-		{680A1709-25EB-4D52-A87F-EE03FFD94BAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

-		{680A1709-25EB-4D52-A87F-EE03FFD94BAA}.Debug|Any CPU.Build.0 = Debug|Any CPU

-		{680A1709-25EB-4D52-A87F-EE03FFD94BAA}.Debug|x86.ActiveCfg = Debug|Any CPU

-		{680A1709-25EB-4D52-A87F-EE03FFD94BAA}.Debug|x86.Build.0 = Debug|Any CPU

-		{680A1709-25EB-4D52-A87F-EE03FFD94BAA}.Release Mono|Any CPU.ActiveCfg = Release|Any CPU

-		{680A1709-25EB-4D52-A87F-EE03FFD94BAA}.Release Mono|Any CPU.Build.0 = Release|Any CPU

-		{680A1709-25EB-4D52-A87F-EE03FFD94BAA}.Release Mono|x86.ActiveCfg = Release|Any CPU

-		{680A1709-25EB-4D52-A87F-EE03FFD94BAA}.Release Mono|x86.Build.0 = Release|Any CPU

-		{680A1709-25EB-4D52-A87F-EE03FFD94BAA}.Release|Any CPU.ActiveCfg = Release|Any CPU

-		{680A1709-25EB-4D52-A87F-EE03FFD94BAA}.Release|Any CPU.Build.0 = Release|Any CPU

-		{680A1709-25EB-4D52-A87F-EE03FFD94BAA}.Release|x86.ActiveCfg = Release|Any CPU

-		{680A1709-25EB-4D52-A87F-EE03FFD94BAA}.Release|x86.Build.0 = Release|Any CPU

-		{680A1709-25EB-4D52-A87F-EE03FFD94BAA}.Signed|Any CPU.ActiveCfg = Signed|Any CPU

-		{680A1709-25EB-4D52-A87F-EE03FFD94BAA}.Signed|Any CPU.Build.0 = Signed|Any CPU

-		{680A1709-25EB-4D52-A87F-EE03FFD94BAA}.Signed|x86.ActiveCfg = Signed|Any CPU

-		{680A1709-25EB-4D52-A87F-EE03FFD94BAA}.Signed|x86.Build.0 = Signed|Any CPU

 	EndGlobalSection

 	GlobalSection(SolutionProperties) = preSolution

 		HideSolutionNode = FALSE

diff --git a/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj b/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj
index f7f084917..eb5e9880e 100644
--- a/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj
+++ b/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj
@@ -122,10 +122,16 @@
       <HintPath>..\ThirdParty\taglib\TagLib.Portable.dll</HintPath>

     </Reference>

     <Reference Include="SQLitePCLRaw.core">

-      <HintPath>..\packages\SQLitePCLRaw.core.1.1.1\lib\net45\SQLitePCLRaw.core.dll</HintPath>

+      <HintPath>..\packages\SQLitePCLRaw.core.1.1.2\lib\net45\SQLitePCLRaw.core.dll</HintPath>

     </Reference>

     <Reference Include="SQLitePCLRaw.provider.sqlite3">

-      <HintPath>..\packages\SQLitePCLRaw.provider.sqlite3.net45.1.1.1\lib\net45\SQLitePCLRaw.provider.sqlite3.dll</HintPath>

+      <HintPath>..\packages\SQLitePCLRaw.provider.sqlite3.net45.1.1.2\lib\net45\SQLitePCLRaw.provider.sqlite3.dll</HintPath>

+    </Reference>

+    <Reference Include="Emby.Server.Connect">

+      <HintPath>..\ThirdParty\emby\Emby.Server.Connect.dll</HintPath>

+    </Reference>

+    <Reference Include="Emby.Server.Sync">

+      <HintPath>..\ThirdParty\emby\Emby.Server.Sync.dll</HintPath>

     </Reference>

   </ItemGroup>

   <ItemGroup>

@@ -246,10 +252,6 @@
       <Project>{4F26D5D8-A7B0-42B3-BA42-7CB7D245934E}</Project>

       <Name>SocketHttpListener.Portable</Name>

     </ProjectReference>

-    <ProjectReference Include="..\ServiceStack\ServiceStack.csproj">

-      <Project>{680A1709-25EB-4D52-A87F-EE03FFD94BAA}</Project>

-      <Name>ServiceStack</Name>

-    </ProjectReference>

     <ProjectReference Include="..\RSSDP\RSSDP.csproj">

       <Project>{21002819-C39A-4D3E-BE83-2A276A77FB1F}</Project>

       <Name>RSSDP</Name>

@@ -813,6 +815,9 @@
     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\thememediaplayer.js">

       <Link>Resources\dashboard-ui\bower_components\emby-webcomponents\thememediaplayer.js</Link>

     </BundleResource>

+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\touchhelper.js">

+      <Link>Resources\dashboard-ui\bower_components\emby-webcomponents\touchhelper.js</Link>

+    </BundleResource>

     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\visibleinviewport.js">

       <Link>Resources\dashboard-ui\bower_components\emby-webcomponents\visibleinviewport.js</Link>

     </BundleResource>

@@ -918,6 +923,9 @@
     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\emby-radio\emby-radio.js">

       <Link>Resources\dashboard-ui\bower_components\emby-webcomponents\emby-radio\emby-radio.js</Link>

     </BundleResource>

+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\emby-scroller\emby-scroller.js">

+      <Link>Resources\dashboard-ui\bower_components\emby-webcomponents\emby-scroller\emby-scroller.js</Link>

+    </BundleResource>

     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\emby-select\emby-select.css">

       <Link>Resources\dashboard-ui\bower_components\emby-webcomponents\emby-select\emby-select.css</Link>

     </BundleResource>

@@ -1092,6 +1100,9 @@
     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\images\persistentimagefetcher.js">

       <Link>Resources\dashboard-ui\bower_components\emby-webcomponents\images\persistentimagefetcher.js</Link>

     </BundleResource>

+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\images\style.css">

+      <Link>Resources\dashboard-ui\bower_components\emby-webcomponents\images\style.css</Link>

+    </BundleResource>

     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\indicators\indicators.css">

       <Link>Resources\dashboard-ui\bower_components\emby-webcomponents\indicators\indicators.css</Link>

     </BundleResource>

@@ -1194,6 +1205,12 @@
     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\playback\autoplaydetect.js">

       <Link>Resources\dashboard-ui\bower_components\emby-webcomponents\playback\autoplaydetect.js</Link>

     </BundleResource>

+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\playback\iconosd.css">

+      <Link>Resources\dashboard-ui\bower_components\emby-webcomponents\playback\iconosd.css</Link>

+    </BundleResource>

+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\playback\mediasession.js">

+      <Link>Resources\dashboard-ui\bower_components\emby-webcomponents\playback\mediasession.js</Link>

+    </BundleResource>

     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\playback\nowplayinghelper.js">

       <Link>Resources\dashboard-ui\bower_components\emby-webcomponents\playback\nowplayinghelper.js</Link>

     </BundleResource>

@@ -1212,6 +1229,9 @@
     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\playback\remotecontrolautoplay.js">

       <Link>Resources\dashboard-ui\bower_components\emby-webcomponents\playback\remotecontrolautoplay.js</Link>

     </BundleResource>

+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\playback\volumeosd.js">

+      <Link>Resources\dashboard-ui\bower_components\emby-webcomponents\playback\volumeosd.js</Link>

+    </BundleResource>

     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\emby-webcomponents\playlisteditor\playlisteditor.js">

       <Link>Resources\dashboard-ui\bower_components\emby-webcomponents\playlisteditor\playlisteditor.js</Link>

     </BundleResource>

@@ -1698,21 +1718,6 @@
     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\vibrant\dist\vibrant.min.js">

       <Link>Resources\dashboard-ui\bower_components\vibrant\dist\vibrant.min.js</Link>

     </BundleResource>

-    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\web-animations-js\COPYING">

-      <Link>Resources\dashboard-ui\bower_components\web-animations-js\COPYING</Link>

-    </BundleResource>

-    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\web-animations-js\web-animations-next-lite.min.js">

-      <Link>Resources\dashboard-ui\bower_components\web-animations-js\web-animations-next-lite.min.js</Link>

-    </BundleResource>

-    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\web-animations-js\web-animations-next.min.js">

-      <Link>Resources\dashboard-ui\bower_components\web-animations-js\web-animations-next.min.js</Link>

-    </BundleResource>

-    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\web-animations-js\web-animations.html">

-      <Link>Resources\dashboard-ui\bower_components\web-animations-js\web-animations.html</Link>

-    </BundleResource>

-    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\web-animations-js\web-animations.min.js">

-      <Link>Resources\dashboard-ui\bower_components\web-animations-js\web-animations.min.js</Link>

-    </BundleResource>

     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\bower_components\webcomponentsjs\webcomponents-lite.min.js">

       <Link>Resources\dashboard-ui\bower_components\webcomponentsjs\webcomponents-lite.min.js</Link>

     </BundleResource>

@@ -2151,9 +2156,6 @@
     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\dashboard\wizardfinishpage.js">

       <Link>Resources\dashboard-ui\dashboard\wizardfinishpage.js</Link>

     </BundleResource>

-    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\devices\android\android.css">

-      <Link>Resources\dashboard-ui\devices\android\android.css</Link>

-    </BundleResource>

     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\devices\ios\ios.css">

       <Link>Resources\dashboard-ui\devices\ios\ios.css</Link>

     </BundleResource>

@@ -2253,9 +2255,6 @@
     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\homefavorites.js">

       <Link>Resources\dashboard-ui\scripts\homefavorites.js</Link>

     </BundleResource>

-    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\homenextup.js">

-      <Link>Resources\dashboard-ui\scripts\homenextup.js</Link>

-    </BundleResource>

     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\homeupcoming.js">

       <Link>Resources\dashboard-ui\scripts\homeupcoming.js</Link>

     </BundleResource>

diff --git a/MediaBrowser.Server.Mac/MacAppHost.cs b/MediaBrowser.Server.Mac/MacAppHost.cs
index d73a8fbbd..59e72e71e 100644
--- a/MediaBrowser.Server.Mac/MacAppHost.cs
+++ b/MediaBrowser.Server.Mac/MacAppHost.cs
@@ -9,6 +9,10 @@ using MediaBrowser.Model.Logging;
 using MediaBrowser.Model.System;
 using Emby.Server.Mac.Native;
 using System.Diagnostics;
+using MediaBrowser.Controller.Connect;
+using Emby.Server.Connect;
+using Emby.Server.Sync;
+using MediaBrowser.Controller.Sync;
 
 namespace MediaBrowser.Server.Mac
 {
@@ -42,6 +46,16 @@ namespace MediaBrowser.Server.Mac
 			}
 		}
 
+		protected override IConnectManager CreateConnectManager()
+		{
+			return new ConnectManager();
+		}
+
+		protected override ISyncManager CreateSyncManager()
+		{
+			return new SyncManager();
+		}
+
         protected override FFMpegInstallInfo GetFfmpegInstallInfo()
         {
             var info = new FFMpegInstallInfo();
@@ -88,6 +102,8 @@ namespace MediaBrowser.Server.Mac
             var list = new List<Assembly>();
 
             list.Add(GetType().Assembly);
+			list.Add(typeof(ConnectManager).Assembly);
+			list.Add(typeof(SyncManager).Assembly);
 
             return list;
         }
diff --git a/MediaBrowser.Server.Mac/Main.cs b/MediaBrowser.Server.Mac/Main.cs
index 8c5ca6c1f..debd5f539 100644
--- a/MediaBrowser.Server.Mac/Main.cs
+++ b/MediaBrowser.Server.Mac/Main.cs
@@ -22,6 +22,7 @@ using MonoMac.ObjCRuntime;
 using Emby.Server.Core;
 using Emby.Server.Implementations;
 using Emby.Common.Implementations.Logging;
+using Emby.Server.Implementations.Logging;
 using Emby.Common.Implementations.EnvironmentInfo;
 using Emby.Server.Mac.Native;
 using Emby.Server.Implementations.IO;
@@ -29,6 +30,8 @@ using Emby.Common.Implementations.Networking;
 using Emby.Common.Implementations.Security;
 using Mono.Unix.Native;
 using MediaBrowser.Model.System;
+using MediaBrowser.Model.IO;
+using Emby.Server.Core.Logging;
 
 namespace MediaBrowser.Server.Mac
 {
@@ -37,6 +40,7 @@ namespace MediaBrowser.Server.Mac
 		internal static MacAppHost AppHost;
 
 		private static ILogger _logger;
+		private static IFileSystem _fileSystem;
 
 		static void Main (string[] args)
 		{
@@ -83,7 +87,9 @@ namespace MediaBrowser.Server.Mac
 			// Within the mac bundle, go uo two levels then down into Resources folder
 			var resourcesPath = Path.Combine(Path.GetDirectoryName(appFolderPath), "Resources");
 
-			return new ServerApplicationPaths(programDataPath, appFolderPath, resourcesPath);
+			Action<string> createDirectoryFn = (string obj) => Directory.CreateDirectory(obj);
+
+			return new ServerApplicationPaths(programDataPath, appFolderPath, resourcesPath, createDirectoryFn);
 		}
 
 		/// <summary>
@@ -102,6 +108,8 @@ namespace MediaBrowser.Server.Mac
 			var fileSystem = new MonoFileSystem(logManager.GetLogger("FileSystem"), false, false, appPaths.TempDirectory);
             fileSystem.AddShortcutHandler(new MbLinkShortcutHandler(fileSystem));
 
+			_fileSystem = fileSystem;
+
 			var environmentInfo = GetEnvironmentInfo();
 
 			var imageEncoder = ImageEncoderHelper.GetImageEncoder(_logger, 
@@ -294,7 +302,9 @@ namespace MediaBrowser.Server.Mac
 		{
 			var exception = (Exception)e.ExceptionObject;
 
-			new UnhandledExceptionWriter(AppHost.ServerConfigurationManager.ApplicationPaths, _logger, AppHost.LogManager).Log(exception);
+			var consoleLogger = new ConsoleLogger();
+
+			new UnhandledExceptionWriter(AppHost.ServerConfigurationManager.ApplicationPaths, _logger, AppHost.LogManager, _fileSystem, consoleLogger).Log(exception);
 
 			if (!Debugger.IsAttached)
 			{
diff --git a/SharedVersion.cs b/SharedVersion.cs
index 5e662ebe6..069f6e9fc 100644
--- a/SharedVersion.cs
+++ b/SharedVersion.cs
@@ -1,3 +1,3 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("3.2.2.1")]
+[assembly: AssemblyVersion("3.2.3.1")]