diff --git a/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj b/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj
index 237325cfe7..b61281f1bd 100644
--- a/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj
+++ b/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj
@@ -32,6 +32,7 @@
true
Developer ID Installer
false
+ false
true
@@ -47,6 +48,7 @@
true
Developer ID Installer
false
+ false
full
@@ -63,6 +65,7 @@
false
false
false
+ false
@@ -89,7 +92,6 @@
-
@@ -260,9 +262,6 @@
Resources\dashboard-ui\addplugin.html
-
- Resources\dashboard-ui\advanced.html
-
Resources\dashboard-ui\appservices.html
@@ -281,9 +280,6 @@
Resources\dashboard-ui\channels.html
-
- Resources\dashboard-ui\channelsettings.html
-
Resources\dashboard-ui\cinemamodeconfiguration.html
@@ -317,9 +313,6 @@
Resources\dashboard-ui\dlnaprofiles.html
-
- Resources\dashboard-ui\dlnaserversettings.html
-
Resources\dashboard-ui\dlnasettings.html
@@ -425,9 +418,6 @@
Resources\dashboard-ui\metadata.html
-
- Resources\dashboard-ui\metadataadvanced.html
-
Resources\dashboard-ui\metadataimages.html
@@ -524,9 +514,6 @@
Resources\dashboard-ui\streamingsettings.html
-
- Resources\dashboard-ui\support.html
-
Resources\dashboard-ui\supporterkey.html
@@ -929,6 +916,21 @@
Resources\dashboard-ui\bower_components\Swiper\src\less\swiper.less
+
+ Resources\dashboard-ui\bower_components\alameda\.bower.json
+
+
+ Resources\dashboard-ui\bower_components\alameda\LICENSE
+
+
+ Resources\dashboard-ui\bower_components\alameda\alameda.js
+
+
+ Resources\dashboard-ui\bower_components\alameda\bower.json
+
+
+ Resources\dashboard-ui\bower_components\alameda\shrinktest.sh
+
Resources\dashboard-ui\bower_components\cryptojslib\.bower.json
@@ -1334,6 +1336,12 @@
Resources\dashboard-ui\bower_components\emby-webcomponents\scrollhelper.js
+
+ Resources\dashboard-ui\bower_components\emby-webcomponents\scrollstyles.css
+
+
+ Resources\dashboard-ui\bower_components\emby-webcomponents\servernotifications.js
+
Resources\dashboard-ui\bower_components\emby-webcomponents\usersettings.js
@@ -1571,6 +1579,9 @@
Resources\dashboard-ui\bower_components\emby-webcomponents\images\persistentimagefetcher.js
+
+ Resources\dashboard-ui\bower_components\emby-webcomponents\input\api.js
+
Resources\dashboard-ui\bower_components\emby-webcomponents\loading\loading-lite.js
@@ -1970,6 +1981,9 @@
Resources\dashboard-ui\bower_components\iron-a11y-keys-behavior\iron-a11y-keys-behavior.html
+
+ Resources\dashboard-ui\bower_components\iron-a11y-keys-behavior\.github\ISSUE_TEMPLATE.md
+
Resources\dashboard-ui\bower_components\iron-a11y-keys-behavior\demo\index.html
@@ -2162,9 +2176,18 @@
Resources\dashboard-ui\bower_components\iron-demo-helpers\index.html
+
+ Resources\dashboard-ui\bower_components\iron-demo-helpers\url-bar.html
+
+
+ Resources\dashboard-ui\bower_components\iron-demo-helpers\.github\ISSUE_TEMPLATE.md
+
Resources\dashboard-ui\bower_components\iron-demo-helpers\demo\index.html
+
+ Resources\dashboard-ui\bower_components\iron-demo-helpers\demo\url-bar.html
+
Resources\dashboard-ui\bower_components\iron-demo-helpers\test\basic.html
@@ -2513,6 +2536,9 @@
Resources\dashboard-ui\bower_components\iron-input\iron-input.html
+
+ Resources\dashboard-ui\bower_components\iron-input\.github\ISSUE_TEMPLATE.md
+
Resources\dashboard-ui\bower_components\iron-input\demo\index.html
@@ -2528,9 +2554,60 @@
Resources\dashboard-ui\bower_components\iron-input\test\letters-only.html
+
+ Resources\dashboard-ui\bower_components\iron-location\.bower.json
+
+
+ Resources\dashboard-ui\bower_components\iron-location\.gitignore
+
+
+ Resources\dashboard-ui\bower_components\iron-location\.travis.yml
+
+
+ Resources\dashboard-ui\bower_components\iron-location\CONTRIBUTING.md
+
+
+ Resources\dashboard-ui\bower_components\iron-location\README.md
+
+
+ Resources\dashboard-ui\bower_components\iron-location\bower.json
+
+
+ Resources\dashboard-ui\bower_components\iron-location\index.html
+
+
+ Resources\dashboard-ui\bower_components\iron-location\iron-location.html
+
+
+ Resources\dashboard-ui\bower_components\iron-location\iron-query-params.html
+
Resources\dashboard-ui\bower_components\iron-location\.github\ISSUE_TEMPLATE.md
+
+ Resources\dashboard-ui\bower_components\iron-location\demo\index.html
+
+
+ Resources\dashboard-ui\bower_components\iron-location\demo\iron-query-params.html
+
+
+ Resources\dashboard-ui\bower_components\iron-location\test\index.html
+
+
+ Resources\dashboard-ui\bower_components\iron-location\test\initialization-cases.html
+
+
+ Resources\dashboard-ui\bower_components\iron-location\test\initialization-iframe.html
+
+
+ Resources\dashboard-ui\bower_components\iron-location\test\initialization-tests.html
+
+
+ Resources\dashboard-ui\bower_components\iron-location\test\iron-location.html
+
+
+ Resources\dashboard-ui\bower_components\iron-location\test\iron-query-params.html
+
Resources\dashboard-ui\bower_components\iron-media-query\.bower.json
@@ -2702,12 +2779,18 @@
Resources\dashboard-ui\bower_components\iron-overlay-behavior\test\index.html
+
+ Resources\dashboard-ui\bower_components\iron-overlay-behavior\test\iron-overlay-backdrop.html
+
Resources\dashboard-ui\bower_components\iron-overlay-behavior\test\iron-overlay-behavior.html
Resources\dashboard-ui\bower_components\iron-overlay-behavior\test\test-buttons.html
+
+ Resources\dashboard-ui\bower_components\iron-overlay-behavior\test\test-menu-button.html
+
Resources\dashboard-ui\bower_components\iron-overlay-behavior\test\test-overlay.html
@@ -2858,6 +2941,9 @@
Resources\dashboard-ui\bower_components\iron-selector\iron-selector.html
+
+ Resources\dashboard-ui\bower_components\iron-selector\.github\ISSUE_TEMPLATE.md
+
Resources\dashboard-ui\bower_components\iron-selector\demo\index.html
@@ -3353,6 +3439,36 @@
Resources\dashboard-ui\bower_components\jstree\src\themes\default-dark\throbber.gif
+
+ Resources\dashboard-ui\bower_components\libjass\.bower.json
+
+
+ Resources\dashboard-ui\bower_components\libjass\CHANGELOG.md
+
+
+ Resources\dashboard-ui\bower_components\libjass\LICENSE
+
+
+ Resources\dashboard-ui\bower_components\libjass\README.md
+
+
+ Resources\dashboard-ui\bower_components\libjass\libjass.css
+
+
+ Resources\dashboard-ui\bower_components\libjass\libjass.js
+
+
+ Resources\dashboard-ui\bower_components\libjass\libjass.js.map
+
+
+ Resources\dashboard-ui\bower_components\libjass\libjass.min.js
+
+
+ Resources\dashboard-ui\bower_components\libjass\libjass.min.js.map
+
+
+ Resources\dashboard-ui\bower_components\libjass\package.json
+
Resources\dashboard-ui\bower_components\marked\.bower.json
@@ -4163,6 +4279,9 @@
Resources\dashboard-ui\bower_components\neon-animation\web-animations.html
+
+ Resources\dashboard-ui\bower_components\neon-animation\.github\ISSUE_TEMPLATE.md
+
Resources\dashboard-ui\bower_components\neon-animation\animations\cascaded-animation.html
@@ -4307,6 +4426,9 @@
Resources\dashboard-ui\bower_components\neon-animation\test\index.html
+
+ Resources\dashboard-ui\bower_components\neon-animation\test\neon-animated-pages-lazy.html
+
Resources\dashboard-ui\bower_components\neon-animation\test\neon-animated-pages.html
@@ -4751,6 +4873,9 @@
Resources\dashboard-ui\bower_components\paper-input\paper-textarea.html
+
+ Resources\dashboard-ui\bower_components\paper-input\.github\ISSUE_TEMPLATE.md
+
Resources\dashboard-ui\bower_components\paper-input\demo\index.html
@@ -4820,6 +4945,9 @@
Resources\dashboard-ui\bower_components\paper-item\paper-item.html
+
+ Resources\dashboard-ui\bower_components\paper-item\.github\ISSUE_TEMPLATE.md
+
Resources\dashboard-ui\bower_components\paper-item\demo\index.html
@@ -4925,6 +5053,9 @@
Resources\dashboard-ui\bower_components\paper-menu-button\paper-menu-button.html
+
+ Resources\dashboard-ui\bower_components\paper-menu-button\.github\ISSUE_TEMPLATE.md
+
Resources\dashboard-ui\bower_components\paper-menu-button\demo\index.html
@@ -8879,6 +9010,12 @@
Resources\dashboard-ui\components\chromecasthelpers.js
+
+ Resources\dashboard-ui\components\favoriteitems.js
+
+
+ Resources\dashboard-ui\components\filedownloader.js
+
Resources\dashboard-ui\components\humanedate.js
@@ -8888,6 +9025,9 @@
Resources\dashboard-ui\components\remotecontrolautoplay.js
+
+ Resources\dashboard-ui\components\servertestermessage.js
+
Resources\dashboard-ui\components\sharingwidget.js
@@ -9068,6 +9208,9 @@
Resources\dashboard-ui\css\images\logindefault.png
+
+ Resources\dashboard-ui\css\images\logo.png
+
Resources\dashboard-ui\css\images\logo536.png
@@ -9161,9 +9304,6 @@
Resources\dashboard-ui\css\images\editor\missingprimaryimage.png
-
- Resources\dashboard-ui\css\images\editor\missingtrailer.png
-
Resources\dashboard-ui\css\images\items\detail\audio.png
@@ -9338,9 +9478,6 @@
Resources\dashboard-ui\legacy\fnchecked.js
-
- Resources\dashboard-ui\legacy\objectassign.js
-
Resources\dashboard-ui\legacy\selectmenu.js
@@ -9350,9 +9487,6 @@
Resources\dashboard-ui\scripts\addpluginpage.js
-
- Resources\dashboard-ui\scripts\advancedconfigurationpage.js
-
Resources\dashboard-ui\scripts\alphapicker.js
@@ -9377,9 +9511,6 @@
Resources\dashboard-ui\scripts\channels.js
-
- Resources\dashboard-ui\scripts\channelsettings.js
-
Resources\dashboard-ui\scripts\channelslatest.js
@@ -9416,9 +9547,6 @@
Resources\dashboard-ui\scripts\dlnaprofiles.js
-
- Resources\dashboard-ui\scripts\dlnaserversettings.js
-
Resources\dashboard-ui\scripts\dlnasettings.js
@@ -9464,6 +9592,9 @@
Resources\dashboard-ui\scripts\gamesystemspage.js
+
+ Resources\dashboard-ui\scripts\homefavorites.js
+
Resources\dashboard-ui\scripts\homenextup.js
@@ -9578,9 +9709,6 @@
Resources\dashboard-ui\scripts\mediaplayer.js
-
- Resources\dashboard-ui\scripts\metadataadvanced.js
-
Resources\dashboard-ui\scripts\metadataconfigurationpage.js
@@ -9917,9 +10045,6 @@
Resources\dashboard-ui\strings\ru.json
-
- Resources\dashboard-ui\strings\server.json
-
Resources\dashboard-ui\strings\sl-SI.json
diff --git a/MediaBrowser.Server.Mac/MenuBarIcon.cs b/MediaBrowser.Server.Mac/MenuBarIcon.cs
index 51ba7f432e..865f45057a 100644
--- a/MediaBrowser.Server.Mac/MenuBarIcon.cs
+++ b/MediaBrowser.Server.Mac/MenuBarIcon.cs
@@ -88,17 +88,17 @@ namespace MediaBrowser.Server.Mac
private void Community(NSObject sender)
{
- BrowserLauncher.OpenCommunity(Logger);
+ BrowserLauncher.OpenCommunity(MainClass.AppHost);
}
private void Configure(NSObject sender)
{
- BrowserLauncher.OpenDashboard(MainClass.AppHost, Logger);
+ BrowserLauncher.OpenDashboard(MainClass.AppHost);
}
private void Browse(NSObject sender)
{
- BrowserLauncher.OpenWebClient(MainClass.AppHost, Logger);
+ BrowserLauncher.OpenWebClient(MainClass.AppHost);
}
public void Terminate()
diff --git a/MediaBrowser.Server.Mac/Native/BaseMonoApp.cs b/MediaBrowser.Server.Mac/Native/BaseMonoApp.cs
index 33df83b2fc..67ad96859a 100644
--- a/MediaBrowser.Server.Mac/Native/BaseMonoApp.cs
+++ b/MediaBrowser.Server.Mac/Native/BaseMonoApp.cs
@@ -7,6 +7,8 @@ using System.Collections.Generic;
using System.Reflection;
using System.Text.RegularExpressions;
using MediaBrowser.Controller.Power;
+using MediaBrowser.Server.Startup.Common.FFMpeg;
+using System.Diagnostics;
namespace MediaBrowser.Server.Mac
{
@@ -106,6 +108,79 @@ namespace MediaBrowser.Server.Mac
{
}
+ public void LaunchUrl(string url)
+ {
+ var process = new Process
+ {
+ StartInfo = new ProcessStartInfo
+ {
+ FileName = url
+ },
+
+ EnableRaisingEvents = true,
+ };
+
+ process.Exited += ProcessExited;
+
+ process.Start();
+ }
+
+ ///
+ /// Processes the exited.
+ ///
+ /// The sender.
+ /// The instance containing the event data.
+ private static void ProcessExited(object sender, EventArgs e)
+ {
+ ((Process)sender).Dispose();
+ }
+
+ public FFMpegInstallInfo GetFfmpegInstallInfo()
+ {
+ return GetInfo(Environment);
+ }
+
+ public static FFMpegInstallInfo GetInfo(NativeEnvironment environment)
+ {
+ var info = new FFMpegInstallInfo();
+
+ info.ArchiveType = "7z";
+
+ switch (environment.SystemArchitecture)
+ {
+ case Architecture.X86_X64:
+ info.Version = "20160124";
+ break;
+ case Architecture.X86:
+ info.Version = "20150110";
+ break;
+ }
+
+ info.DownloadUrls = GetDownloadUrls(environment);
+
+ return info;
+ }
+
+ private static string[] GetDownloadUrls(NativeEnvironment environment)
+ {
+ switch (environment.SystemArchitecture)
+ {
+ case Architecture.X86_X64:
+ return new[]
+ {
+ "https://github.com/MediaBrowser/Emby.Resources/raw/master/ffmpeg/osx/ffmpeg-x64-2.8.5.7z"
+ };
+ case Architecture.X86:
+ return new[]
+ {
+ "https://github.com/MediaBrowser/Emby.Resources/raw/master/ffmpeg/osx/ffmpeg-x86-2.5.3.7z"
+ };
+ }
+
+ // No version available
+ return new string[] { };
+ }
+
public INetworkManager CreateNetworkManager(ILogger logger)
{
return new NetworkManager(logger);