From 6e696d0b6348c816dee94ffeab598236f509eb36 Mon Sep 17 00:00:00 2001 From: Luke Date: Sat, 25 Mar 2017 19:13:44 -0400 Subject: [PATCH] update mac release --- .../Emby.Server.Mac.csproj | 56 +++++++++---------- MediaBrowser.Server.Mac/MacAppHost.cs | 4 -- .../Native/MonoFileSystem.cs | 5 +- 3 files changed, 28 insertions(+), 37 deletions(-) diff --git a/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj b/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj index 4d9f3e7c4e..bb67a9e36a 100644 --- a/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj +++ b/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj @@ -386,14 +386,8 @@ Resources\dashboard-ui\livetvstatus.html - - Resources\dashboard-ui\livetvtunerprovider-hdhomerun.html - - - Resources\dashboard-ui\livetvtunerprovider-m3u.html - - - Resources\dashboard-ui\livetvtunerprovider-satip.html + + Resources\dashboard-ui\livetvtuner.html Resources\dashboard-ui\log.html @@ -560,12 +554,6 @@ Resources\dashboard-ui\wizardlibrary.html - - Resources\dashboard-ui\wizardlivetvguide.html - - - Resources\dashboard-ui\wizardlivetvtuner.html - Resources\dashboard-ui\wizardsettings.html @@ -800,6 +788,9 @@ Resources\dashboard-ui\bower_components\emby-webcomponents\shortcuts.js + + Resources\dashboard-ui\bower_components\emby-webcomponents\staticbackdrops.js + Resources\dashboard-ui\bower_components\emby-webcomponents\thememediaplayer.js @@ -1253,6 +1244,9 @@ Resources\dashboard-ui\bower_components\emby-webcomponents\recordingcreator\empty.png + + Resources\dashboard-ui\bower_components\emby-webcomponents\recordingcreator\recordingbutton.js + Resources\dashboard-ui\bower_components\emby-webcomponents\recordingcreator\recordingcreator.css @@ -1736,9 +1730,15 @@ Resources\dashboard-ui\components\iap.js + + Resources\dashboard-ui\components\maintabsmanager.js + Resources\dashboard-ui\components\remotecontrol.js + + Resources\dashboard-ui\components\tunerpicker.js + Resources\dashboard-ui\components\viewcontainer-lite.js @@ -2141,8 +2141,8 @@ Resources\dashboard-ui\dashboard\librarysettings.js - - Resources\dashboard-ui\dashboard\livetvtunerprovider-satip.js + + Resources\dashboard-ui\dashboard\livetvtuner.js Resources\dashboard-ui\dashboard\logpage.js @@ -2171,6 +2171,12 @@ Resources\dashboard-ui\legacy\selectmenu.js + + Resources\dashboard-ui\offline\offline.html + + + Resources\dashboard-ui\offline\offline.js + Resources\dashboard-ui\scripts\addpluginpage.js @@ -2189,9 +2195,6 @@ Resources\dashboard-ui\scripts\channels.js - - Resources\dashboard-ui\scripts\channelslatest.js - Resources\dashboard-ui\scripts\connectlogin.js @@ -2306,12 +2309,6 @@ Resources\dashboard-ui\scripts\livetvsuggested.js - - Resources\dashboard-ui\scripts\livetvtunerprovider-hdhomerun.js - - - Resources\dashboard-ui\scripts\livetvtunerprovider-m3u.js - Resources\dashboard-ui\scripts\localsync.js @@ -2516,12 +2513,6 @@ Resources\dashboard-ui\scripts\wizardcontroller.js - - Resources\dashboard-ui\scripts\wizardlivetvguide.js - - - Resources\dashboard-ui\scripts\wizardlivetvtuner.js - Resources\dashboard-ui\scripts\wizardsettings.js @@ -2576,6 +2567,9 @@ Resources\dashboard-ui\strings\es.json + + Resources\dashboard-ui\strings\fa.json + Resources\dashboard-ui\strings\fi.json diff --git a/MediaBrowser.Server.Mac/MacAppHost.cs b/MediaBrowser.Server.Mac/MacAppHost.cs index f84e961269..304472529c 100644 --- a/MediaBrowser.Server.Mac/MacAppHost.cs +++ b/MediaBrowser.Server.Mac/MacAppHost.cs @@ -87,10 +87,6 @@ namespace MediaBrowser.Server.Mac throw new NotImplementedException(); } - protected override void EnableLoopbackInternal(string appName) - { - } - public override bool SupportsRunningAsService { get diff --git a/MediaBrowser.Server.Mac/Native/MonoFileSystem.cs b/MediaBrowser.Server.Mac/Native/MonoFileSystem.cs index daf2b90e62..7aeff5ac8c 100644 --- a/MediaBrowser.Server.Mac/Native/MonoFileSystem.cs +++ b/MediaBrowser.Server.Mac/Native/MonoFileSystem.cs @@ -1,13 +1,14 @@ using Emby.Common.Implementations.IO; using MediaBrowser.Model.Logging; using Mono.Unix.Native; +using MediaBrowser.Model.System; namespace Emby.Server.Mac.Native { public class MonoFileSystem : ManagedFileSystem { - public MonoFileSystem(ILogger logger, bool supportsAsyncFileStreams, bool enableManagedInvalidFileNameChars, string tempPath) - : base(logger, supportsAsyncFileStreams, enableManagedInvalidFileNameChars, true, tempPath) + public MonoFileSystem(ILogger logger, IEnvironmentInfo environmentInfo, string tempPath) + : base(logger, environmentInfo, tempPath) { }