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 @@
..\ThirdParty\taglib\TagLib.Portable.dll
- ..\packages\SQLitePCLRaw.core.1.1.1\lib\net45\SQLitePCLRaw.core.dll
+ ..\packages\SQLitePCLRaw.core.1.1.2\lib\net45\SQLitePCLRaw.core.dll
- ..\packages\SQLitePCLRaw.provider.sqlite3.net45.1.1.1\lib\net45\SQLitePCLRaw.provider.sqlite3.dll
+ ..\packages\SQLitePCLRaw.provider.sqlite3.net45.1.1.2\lib\net45\SQLitePCLRaw.provider.sqlite3.dll
+
+
+ ..\ThirdParty\emby\Emby.Server.Connect.dll
+
+
+ ..\ThirdParty\emby\Emby.Server.Sync.dll
@@ -246,10 +252,6 @@
{4F26D5D8-A7B0-42B3-BA42-7CB7D245934E}
SocketHttpListener.Portable
-
- {680A1709-25EB-4D52-A87F-EE03FFD94BAA}
- ServiceStack
-
{21002819-C39A-4D3E-BE83-2A276A77FB1F}
RSSDP
@@ -813,6 +815,9 @@
Resources\dashboard-ui\bower_components\emby-webcomponents\thememediaplayer.js
+
+ Resources\dashboard-ui\bower_components\emby-webcomponents\touchhelper.js
+
Resources\dashboard-ui\bower_components\emby-webcomponents\visibleinviewport.js
@@ -918,6 +923,9 @@
Resources\dashboard-ui\bower_components\emby-webcomponents\emby-radio\emby-radio.js
+
+ Resources\dashboard-ui\bower_components\emby-webcomponents\emby-scroller\emby-scroller.js
+
Resources\dashboard-ui\bower_components\emby-webcomponents\emby-select\emby-select.css
@@ -1092,6 +1100,9 @@
Resources\dashboard-ui\bower_components\emby-webcomponents\images\persistentimagefetcher.js
+
+ Resources\dashboard-ui\bower_components\emby-webcomponents\images\style.css
+
Resources\dashboard-ui\bower_components\emby-webcomponents\indicators\indicators.css
@@ -1194,6 +1205,12 @@
Resources\dashboard-ui\bower_components\emby-webcomponents\playback\autoplaydetect.js
+
+ Resources\dashboard-ui\bower_components\emby-webcomponents\playback\iconosd.css
+
+
+ Resources\dashboard-ui\bower_components\emby-webcomponents\playback\mediasession.js
+
Resources\dashboard-ui\bower_components\emby-webcomponents\playback\nowplayinghelper.js
@@ -1212,6 +1229,9 @@
Resources\dashboard-ui\bower_components\emby-webcomponents\playback\remotecontrolautoplay.js
+
+ Resources\dashboard-ui\bower_components\emby-webcomponents\playback\volumeosd.js
+
Resources\dashboard-ui\bower_components\emby-webcomponents\playlisteditor\playlisteditor.js
@@ -1698,21 +1718,6 @@
Resources\dashboard-ui\bower_components\vibrant\dist\vibrant.min.js
-
- Resources\dashboard-ui\bower_components\web-animations-js\COPYING
-
-
- Resources\dashboard-ui\bower_components\web-animations-js\web-animations-next-lite.min.js
-
-
- Resources\dashboard-ui\bower_components\web-animations-js\web-animations-next.min.js
-
-
- Resources\dashboard-ui\bower_components\web-animations-js\web-animations.html
-
-
- Resources\dashboard-ui\bower_components\web-animations-js\web-animations.min.js
-
Resources\dashboard-ui\bower_components\webcomponentsjs\webcomponents-lite.min.js
@@ -2151,9 +2156,6 @@
Resources\dashboard-ui\dashboard\wizardfinishpage.js
-
- Resources\dashboard-ui\devices\android\android.css
-
Resources\dashboard-ui\devices\ios\ios.css
@@ -2253,9 +2255,6 @@
Resources\dashboard-ui\scripts\homefavorites.js
-
- Resources\dashboard-ui\scripts\homenextup.js
-
Resources\dashboard-ui\scripts\homeupcoming.js
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();
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 createDirectoryFn = (string obj) => Directory.CreateDirectory(obj);
+
+ return new ServerApplicationPaths(programDataPath, appFolderPath, resourcesPath, createDirectoryFn);
}
///
@@ -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")]