diff --git a/MediaBrowser.Server.Mac.sln b/MediaBrowser.Server.Mac.sln
index 6fc1dd8925..ba912566ac 100644
--- a/MediaBrowser.Server.Mac.sln
+++ b/MediaBrowser.Server.Mac.sln
@@ -13,8 +13,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MediaBrowser.Controller", "
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MediaBrowser.LocalMetadata", "MediaBrowser.LocalMetadata\MediaBrowser.LocalMetadata.csproj", "{7EF9F3E0-697D-42F3-A08F-19DEB5F84392}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MediaBrowser.MediaEncoding", "MediaBrowser.MediaEncoding\MediaBrowser.MediaEncoding.csproj", "{0BD82FA6-EB8A-4452-8AF5-74F9C3849451}"
-EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MediaBrowser.Model", "MediaBrowser.Model\MediaBrowser.Model.csproj", "{7EEEB4BB-F3E8-48FC-B4C5-70F0FFF8329B}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MediaBrowser.Providers", "MediaBrowser.Providers\MediaBrowser.Providers.csproj", "{442B5058-DCAF-4263-BB6A-F21E31120A1B}"
@@ -47,8 +45,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Emby.Common.Implementations
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SocketHttpListener", "SocketHttpListener\SocketHttpListener.csproj", "{1D74413B-E7CF-455B-B021-F52BDF881542}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Emby.Server.Core", "Emby.Server.Core\Emby.Server.Core.csproj", "{776B9F0C-5195-45E3-9A36-1CC1F0D8E0B0}"
-EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Nat", "Mono.Nat\Mono.Nat.csproj", "{CB7F2326-6497-4A3D-BA03-48513B17A7BE}"
EndProject
Global
@@ -174,26 +170,6 @@ Global
{7EF9F3E0-697D-42F3-A08F-19DEB5F84392}.Signed|Any CPU.Build.0 = Debug|Any CPU
{7EF9F3E0-697D-42F3-A08F-19DEB5F84392}.Signed|x86.ActiveCfg = Debug|Any CPU
{7EF9F3E0-697D-42F3-A08F-19DEB5F84392}.Signed|x86.Build.0 = Debug|Any CPU
- {0BD82FA6-EB8A-4452-8AF5-74F9C3849451}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
- {0BD82FA6-EB8A-4452-8AF5-74F9C3849451}.AppStore|Any CPU.Build.0 = Release|Any CPU
- {0BD82FA6-EB8A-4452-8AF5-74F9C3849451}.AppStore|x86.ActiveCfg = Release Mono|Any CPU
- {0BD82FA6-EB8A-4452-8AF5-74F9C3849451}.AppStore|x86.Build.0 = Release Mono|Any CPU
- {0BD82FA6-EB8A-4452-8AF5-74F9C3849451}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {0BD82FA6-EB8A-4452-8AF5-74F9C3849451}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {0BD82FA6-EB8A-4452-8AF5-74F9C3849451}.Debug|x86.ActiveCfg = Debug|Any CPU
- {0BD82FA6-EB8A-4452-8AF5-74F9C3849451}.Debug|x86.Build.0 = Debug|Any CPU
- {0BD82FA6-EB8A-4452-8AF5-74F9C3849451}.Release Mono|Any CPU.ActiveCfg = Release Mono|Any CPU
- {0BD82FA6-EB8A-4452-8AF5-74F9C3849451}.Release Mono|Any CPU.Build.0 = Release Mono|Any CPU
- {0BD82FA6-EB8A-4452-8AF5-74F9C3849451}.Release Mono|x86.ActiveCfg = Release Mono|Any CPU
- {0BD82FA6-EB8A-4452-8AF5-74F9C3849451}.Release Mono|x86.Build.0 = Release Mono|Any CPU
- {0BD82FA6-EB8A-4452-8AF5-74F9C3849451}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {0BD82FA6-EB8A-4452-8AF5-74F9C3849451}.Release|Any CPU.Build.0 = Release|Any CPU
- {0BD82FA6-EB8A-4452-8AF5-74F9C3849451}.Release|x86.ActiveCfg = Release|Any CPU
- {0BD82FA6-EB8A-4452-8AF5-74F9C3849451}.Release|x86.Build.0 = Release|Any CPU
- {0BD82FA6-EB8A-4452-8AF5-74F9C3849451}.Signed|Any CPU.ActiveCfg = Release Mono|Any CPU
- {0BD82FA6-EB8A-4452-8AF5-74F9C3849451}.Signed|Any CPU.Build.0 = Release Mono|Any CPU
- {0BD82FA6-EB8A-4452-8AF5-74F9C3849451}.Signed|x86.ActiveCfg = Release Mono|Any CPU
- {0BD82FA6-EB8A-4452-8AF5-74F9C3849451}.Signed|x86.Build.0 = Release Mono|Any CPU
{7EEEB4BB-F3E8-48FC-B4C5-70F0FFF8329B}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
{7EEEB4BB-F3E8-48FC-B4C5-70F0FFF8329B}.AppStore|Any CPU.Build.0 = Release|Any CPU
{7EEEB4BB-F3E8-48FC-B4C5-70F0FFF8329B}.AppStore|x86.ActiveCfg = Debug|Any CPU
@@ -582,50 +558,6 @@ Global
{1D74413B-E7CF-455B-B021-F52BDF881542}.Signed|Win32.Build.0 = Debug|Any CPU
{1D74413B-E7CF-455B-B021-F52BDF881542}.Signed|x64.ActiveCfg = Debug|Any CPU
{1D74413B-E7CF-455B-B021-F52BDF881542}.Signed|x64.Build.0 = Debug|Any CPU
- {776B9F0C-5195-45E3-9A36-1CC1F0D8E0B0}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
- {776B9F0C-5195-45E3-9A36-1CC1F0D8E0B0}.AppStore|Any CPU.Build.0 = Debug|Any CPU
- {776B9F0C-5195-45E3-9A36-1CC1F0D8E0B0}.AppStore|x86.ActiveCfg = Debug|Any CPU
- {776B9F0C-5195-45E3-9A36-1CC1F0D8E0B0}.AppStore|x86.Build.0 = Debug|Any CPU
- {776B9F0C-5195-45E3-9A36-1CC1F0D8E0B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {776B9F0C-5195-45E3-9A36-1CC1F0D8E0B0}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {776B9F0C-5195-45E3-9A36-1CC1F0D8E0B0}.Debug|x86.ActiveCfg = Debug|Any CPU
- {776B9F0C-5195-45E3-9A36-1CC1F0D8E0B0}.Debug|x86.Build.0 = Debug|Any CPU
- {776B9F0C-5195-45E3-9A36-1CC1F0D8E0B0}.Release Mono|Any CPU.ActiveCfg = Debug|Any CPU
- {776B9F0C-5195-45E3-9A36-1CC1F0D8E0B0}.Release Mono|Any CPU.Build.0 = Debug|Any CPU
- {776B9F0C-5195-45E3-9A36-1CC1F0D8E0B0}.Release Mono|x86.ActiveCfg = Debug|Any CPU
- {776B9F0C-5195-45E3-9A36-1CC1F0D8E0B0}.Release Mono|x86.Build.0 = Debug|Any CPU
- {776B9F0C-5195-45E3-9A36-1CC1F0D8E0B0}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {776B9F0C-5195-45E3-9A36-1CC1F0D8E0B0}.Release|Any CPU.Build.0 = Release|Any CPU
- {776B9F0C-5195-45E3-9A36-1CC1F0D8E0B0}.Release|x86.ActiveCfg = Release|Any CPU
- {776B9F0C-5195-45E3-9A36-1CC1F0D8E0B0}.Release|x86.Build.0 = Release|Any CPU
- {776B9F0C-5195-45E3-9A36-1CC1F0D8E0B0}.Signed|Any CPU.ActiveCfg = Debug|Any CPU
- {776B9F0C-5195-45E3-9A36-1CC1F0D8E0B0}.Signed|Any CPU.Build.0 = Debug|Any CPU
- {776B9F0C-5195-45E3-9A36-1CC1F0D8E0B0}.Signed|x86.ActiveCfg = Debug|Any CPU
- {776B9F0C-5195-45E3-9A36-1CC1F0D8E0B0}.Signed|x86.Build.0 = Debug|Any CPU
- {776B9F0C-5195-45E3-9A36-1CC1F0D8E0B0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
- {776B9F0C-5195-45E3-9A36-1CC1F0D8E0B0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
- {776B9F0C-5195-45E3-9A36-1CC1F0D8E0B0}.Debug|Win32.ActiveCfg = Debug|Any CPU
- {776B9F0C-5195-45E3-9A36-1CC1F0D8E0B0}.Debug|Win32.Build.0 = Debug|Any CPU
- {776B9F0C-5195-45E3-9A36-1CC1F0D8E0B0}.Debug|x64.ActiveCfg = Debug|Any CPU
- {776B9F0C-5195-45E3-9A36-1CC1F0D8E0B0}.Debug|x64.Build.0 = Debug|Any CPU
- {776B9F0C-5195-45E3-9A36-1CC1F0D8E0B0}.Release Mono|Mixed Platforms.ActiveCfg = Debug|Any CPU
- {776B9F0C-5195-45E3-9A36-1CC1F0D8E0B0}.Release Mono|Mixed Platforms.Build.0 = Debug|Any CPU
- {776B9F0C-5195-45E3-9A36-1CC1F0D8E0B0}.Release Mono|Win32.ActiveCfg = Debug|Any CPU
- {776B9F0C-5195-45E3-9A36-1CC1F0D8E0B0}.Release Mono|Win32.Build.0 = Debug|Any CPU
- {776B9F0C-5195-45E3-9A36-1CC1F0D8E0B0}.Release Mono|x64.ActiveCfg = Debug|Any CPU
- {776B9F0C-5195-45E3-9A36-1CC1F0D8E0B0}.Release Mono|x64.Build.0 = Debug|Any CPU
- {776B9F0C-5195-45E3-9A36-1CC1F0D8E0B0}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
- {776B9F0C-5195-45E3-9A36-1CC1F0D8E0B0}.Release|Mixed Platforms.Build.0 = Release|Any CPU
- {776B9F0C-5195-45E3-9A36-1CC1F0D8E0B0}.Release|Win32.ActiveCfg = Release|Any CPU
- {776B9F0C-5195-45E3-9A36-1CC1F0D8E0B0}.Release|Win32.Build.0 = Release|Any CPU
- {776B9F0C-5195-45E3-9A36-1CC1F0D8E0B0}.Release|x64.ActiveCfg = Release|Any CPU
- {776B9F0C-5195-45E3-9A36-1CC1F0D8E0B0}.Release|x64.Build.0 = Release|Any CPU
- {776B9F0C-5195-45E3-9A36-1CC1F0D8E0B0}.Signed|Mixed Platforms.ActiveCfg = Debug|Any CPU
- {776B9F0C-5195-45E3-9A36-1CC1F0D8E0B0}.Signed|Mixed Platforms.Build.0 = Debug|Any CPU
- {776B9F0C-5195-45E3-9A36-1CC1F0D8E0B0}.Signed|Win32.ActiveCfg = Debug|Any CPU
- {776B9F0C-5195-45E3-9A36-1CC1F0D8E0B0}.Signed|Win32.Build.0 = Debug|Any CPU
- {776B9F0C-5195-45E3-9A36-1CC1F0D8E0B0}.Signed|x64.ActiveCfg = Debug|Any CPU
- {776B9F0C-5195-45E3-9A36-1CC1F0D8E0B0}.Signed|x64.Build.0 = Debug|Any CPU
{CB7F2326-6497-4A3D-BA03-48513B17A7BE}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
{CB7F2326-6497-4A3D-BA03-48513B17A7BE}.AppStore|Any CPU.Build.0 = Debug|Any CPU
{CB7F2326-6497-4A3D-BA03-48513B17A7BE}.AppStore|x86.ActiveCfg = Debug|Any CPU
diff --git a/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj b/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj
index cbf30db8e6..161a4076a0 100644
--- a/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj
+++ b/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj
@@ -130,6 +130,9 @@
..\ThirdParty\emby\Emby.Server.CinemaMode.dll
+
+ ..\ThirdParty\emby\Emby.Server.MediaEncoding.dll
+
@@ -182,10 +185,6 @@
{7EF9F3E0-697D-42F3-A08F-19DEB5F84392}
MediaBrowser.LocalMetadata
-
- {0BD82FA6-EB8A-4452-8AF5-74F9C3849451}
- MediaBrowser.MediaEncoding
-
{442B5058-DCAF-4263-BB6A-F21E31120A1B}
MediaBrowser.Providers
@@ -246,10 +245,6 @@
{1D74413B-E7CF-455B-B021-F52BDF881542}
SocketHttpListener
-
- {776B9F0C-5195-45E3-9A36-1CC1F0D8E0B0}
- Emby.Server.Core
-
{CB7F2326-6497-4A3D-BA03-48513B17A7BE}
Mono.Nat
@@ -270,12 +265,6 @@
Resources\dashboard-ui\autoorganizelog.html
-
- Resources\dashboard-ui\autoorganizesmart.html
-
-
- Resources\dashboard-ui\autoorganizetv.html
-
Resources\dashboard-ui\camerauploadsettings.html
@@ -729,9 +718,6 @@
Resources\dashboard-ui\bower_components\emby-webcomponents\globalize.js
-
- Resources\dashboard-ui\bower_components\emby-webcomponents\homesections.js
-
Resources\dashboard-ui\bower_components\emby-webcomponents\idb.js
@@ -786,6 +772,9 @@
Resources\dashboard-ui\bower_components\emby-webcomponents\shortcuts.js
+
+ Resources\dashboard-ui\bower_components\emby-webcomponents\skinmanager.js
+
Resources\dashboard-ui\bower_components\emby-webcomponents\staticbackdrops.js
@@ -852,9 +841,6 @@
Resources\dashboard-ui\bower_components\emby-webcomponents\confirm\nativeconfirm.js
-
- Resources\dashboard-ui\bower_components\emby-webcomponents\dialog\dialog.css
-
Resources\dashboard-ui\bower_components\emby-webcomponents\dialog\dialog.js
@@ -897,9 +883,6 @@
Resources\dashboard-ui\bower_components\emby-webcomponents\emby-input\emby-input.js
-
- Resources\dashboard-ui\bower_components\emby-webcomponents\emby-itemrefreshindicator\emby-itemrefreshindicator.css
-
Resources\dashboard-ui\bower_components\emby-webcomponents\emby-itemrefreshindicator\emby-itemrefreshindicator.js
@@ -954,6 +937,12 @@
Resources\dashboard-ui\bower_components\emby-webcomponents\emby-textarea\emby-textarea.js
+
+ Resources\dashboard-ui\bower_components\emby-webcomponents\fonts\fonts.css
+
+
+ Resources\dashboard-ui\bower_components\emby-webcomponents\fonts\fonts.sized.css
+
Resources\dashboard-ui\bower_components\emby-webcomponents\fonts\material-icons\2fcryfnatjcs6g4u3t-y5ewrjpiaoeww8aihgqwrjao.woff
@@ -1005,6 +994,12 @@
Resources\dashboard-ui\bower_components\emby-webcomponents\homescreensettings\homescreensettingsdialog.template.html
+
+ Resources\dashboard-ui\bower_components\emby-webcomponents\homesections\homesections.css
+
+
+ Resources\dashboard-ui\bower_components\emby-webcomponents\homesections\homesections.js
+
Resources\dashboard-ui\bower_components\emby-webcomponents\htmlaudioplayer\blank.mp3
@@ -1275,9 +1270,6 @@
Resources\dashboard-ui\bower_components\emby-webcomponents\registrationservices\registrationservices.js
-
- Resources\dashboard-ui\bower_components\emby-webcomponents\registrationservices\style.css
-
Resources\dashboard-ui\bower_components\emby-webcomponents\require\requirecss.js
@@ -1506,6 +1498,72 @@
Resources\dashboard-ui\bower_components\emby-webcomponents\sync\syncjoblist.js
+
+ Resources\dashboard-ui\bower_components\emby-webcomponents\themes\appletv\logo.png
+
+
+ Resources\dashboard-ui\bower_components\emby-webcomponents\themes\appletv\theme.css
+
+
+ Resources\dashboard-ui\bower_components\emby-webcomponents\themes\dark\logo.png
+
+
+ Resources\dashboard-ui\bower_components\emby-webcomponents\themes\dark\theme.css
+
+
+ Resources\dashboard-ui\bower_components\emby-webcomponents\themes\dark-green\logo.png
+
+
+ Resources\dashboard-ui\bower_components\emby-webcomponents\themes\dark-green\theme.css
+
+
+ Resources\dashboard-ui\bower_components\emby-webcomponents\themes\dark-red\logo.png
+
+
+ Resources\dashboard-ui\bower_components\emby-webcomponents\themes\dark-red\theme.css
+
+
+ Resources\dashboard-ui\bower_components\emby-webcomponents\themes\light\logo.png
+
+
+ Resources\dashboard-ui\bower_components\emby-webcomponents\themes\light\theme.css
+
+
+ Resources\dashboard-ui\bower_components\emby-webcomponents\themes\light-blue\logo.png
+
+
+ Resources\dashboard-ui\bower_components\emby-webcomponents\themes\light-blue\theme.css
+
+
+ Resources\dashboard-ui\bower_components\emby-webcomponents\themes\light-green\logo.png
+
+
+ Resources\dashboard-ui\bower_components\emby-webcomponents\themes\light-green\theme.css
+
+
+ Resources\dashboard-ui\bower_components\emby-webcomponents\themes\light-pink\logo.png
+
+
+ Resources\dashboard-ui\bower_components\emby-webcomponents\themes\light-pink\theme.css
+
+
+ Resources\dashboard-ui\bower_components\emby-webcomponents\themes\light-purple\logo.png
+
+
+ Resources\dashboard-ui\bower_components\emby-webcomponents\themes\light-purple\theme.css
+
+
+ Resources\dashboard-ui\bower_components\emby-webcomponents\themes\light-red\logo.png
+
+
+ Resources\dashboard-ui\bower_components\emby-webcomponents\themes\light-red\theme.css
+
+
+ Resources\dashboard-ui\bower_components\emby-webcomponents\themes\wmc\logo.png
+
+
+ Resources\dashboard-ui\bower_components\emby-webcomponents\themes\wmc\theme.css
+
Resources\dashboard-ui\bower_components\emby-webcomponents\toast\toast.css
@@ -1728,12 +1786,6 @@
Resources\dashboard-ui\components\dockedtabs\dockedtabs.js
-
- Resources\dashboard-ui\components\fileorganizer\fileorganizer.js
-
-
- Resources\dashboard-ui\components\fileorganizer\fileorganizer.template.html
-
Resources\dashboard-ui\components\filterdialog\filterdialog.js
@@ -1797,9 +1849,6 @@
Resources\dashboard-ui\components\tvproviders\xmltv.template.html
-
- Resources\dashboard-ui\css\autoorganizetable.css
-
Resources\dashboard-ui\css\dashboard.css
@@ -2058,15 +2107,6 @@
Resources\dashboard-ui\dashboard\aboutpage.js
-
- Resources\dashboard-ui\dashboard\autoorganizelog.js
-
-
- Resources\dashboard-ui\dashboard\autoorganizesmart.js
-
-
- Resources\dashboard-ui\dashboard\autoorganizetv.js
-
Resources\dashboard-ui\dashboard\cinemamodeconfiguration.js
@@ -2391,6 +2431,9 @@
Resources\dashboard-ui\scripts\taskbutton.js
+
+ Resources\dashboard-ui\scripts\themeloader.js
+
Resources\dashboard-ui\scripts\tvgenres.js
@@ -2502,9 +2545,6 @@
Resources\dashboard-ui\strings\fr-ca.json
-
- Resources\dashboard-ui\strings\fr-fr.json
-
Resources\dashboard-ui\strings\fr.json
@@ -2601,9 +2641,6 @@
Resources\dashboard-ui\themes\holiday\theme.js
-
- Resources\dashboard-ui\thirdparty\jquerymobile-1.4.5\jqm.listview.css
-
Resources\dashboard-ui\thirdparty\jquerymobile-1.4.5\jqm.panel.css
@@ -2616,18 +2653,6 @@
Resources\dashboard-ui\thirdparty\jquerymobile-1.4.5\jqm.popup.js
-
- Resources\dashboard-ui\thirdparty\jquerymobile-1.4.5\jqm.slider.css
-
-
- Resources\dashboard-ui\thirdparty\jquerymobile-1.4.5\jqm.slider.js
-
-
- Resources\dashboard-ui\thirdparty\jquerymobile-1.4.5\jqm.table.css
-
-
- Resources\dashboard-ui\thirdparty\jquerymobile-1.4.5\jqm.table.js
-
Resources\dashboard-ui\thirdparty\jquerymobile-1.4.5\jqm.widget.js
diff --git a/MediaBrowser.Server.Mac/Main.cs b/MediaBrowser.Server.Mac/Main.cs
index d84d696ddd..cedeeb22ec 100644
--- a/MediaBrowser.Server.Mac/Main.cs
+++ b/MediaBrowser.Server.Mac/Main.cs
@@ -19,7 +19,6 @@ using MonoMac.Foundation;
using MonoMac.ObjCRuntime;
using Emby.Server.Core;
using Emby.Server.Core.Cryptography;
-using Emby.Server.Core.IO;
using Emby.Server.Implementations;
using Emby.Common.Implementations.Logging;
using Emby.Server.Implementations.Logging;
@@ -31,7 +30,7 @@ using Emby.Common.Implementations.Cryptography;
using Mono.Unix.Native;
using MediaBrowser.Model.System;
using MediaBrowser.Model.IO;
-using Emby.Server.Core.Logging;
+using Emby.Server.Implementations.Logging;
using Emby.Drawing;
using Emby.Drawing.Skia;
using MediaBrowser.Controller.Drawing;
@@ -125,7 +124,7 @@ namespace MediaBrowser.Server.Mac
"Emby.Server.Mac.pkg",
environmentInfo,
imageEncoder,
- new Startup.Common.SystemEvents(logManager.GetLogger("SystemEvents")),
+ new SystemEvents(logManager.GetLogger("SystemEvents")),
new MemoryStreamProvider(),
new NetworkManager(logManager.GetLogger("NetworkManager")),
GenerateCertificate,