From a8f894215d6cd666003d21386ce7dedef9bd6920 Mon Sep 17 00:00:00 2001 From: Luke Date: Sun, 13 Aug 2017 16:30:53 -0400 Subject: update mac project --- MediaBrowser.Server.Mac/Emby.Server.Mac.csproj | 149 +++++++++++++++---------- MediaBrowser.Server.Mac/Main.cs | 5 +- 2 files changed, 89 insertions(+), 65 deletions(-) (limited to 'MediaBrowser.Server.Mac') diff --git a/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj b/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj index cbf30db8e..161a4076a 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 d84d696dd..cedeeb22e 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, -- cgit v1.2.3