aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2017-05-13 00:20:52 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2017-05-13 00:20:52 -0400
commit375d856dfbf074be145c181e5b5240cb4481a0ec (patch)
tree5f3f8d85395f677decdaf0d89bd771611fbd9077
parentcd0d4f419cd4dfe3b1c622f55065941ee7bb3355 (diff)
update mac project
-rw-r--r--MediaBrowser.Server.Mac/Main.cs18
1 files changed, 16 insertions, 2 deletions
diff --git a/MediaBrowser.Server.Mac/Main.cs b/MediaBrowser.Server.Mac/Main.cs
index 932ff6105..9484a2062 100644
--- a/MediaBrowser.Server.Mac/Main.cs
+++ b/MediaBrowser.Server.Mac/Main.cs
@@ -32,7 +32,9 @@ using Mono.Unix.Native;
using MediaBrowser.Model.System;
using MediaBrowser.Model.IO;
using Emby.Server.Core.Logging;
-using Emby.Drawing.Net;
+using Emby.Drawing.Skia;
+using MediaBrowser.Controller.Drawing;
+using MediaBrowser.Model.Drawing;
namespace MediaBrowser.Server.Mac
{
@@ -112,7 +114,7 @@ namespace MediaBrowser.Server.Mac
_fileSystem = fileSystem;
- var imageEncoder = new GDIImageEncoder(fileSystem, logManager.GetLogger("GDI"));
+ var imageEncoder = GetImageEncoder(appPaths, fileSystem, logManager);
AppHost = new MacAppHost(appPaths,
logManager,
@@ -138,6 +140,18 @@ namespace MediaBrowser.Server.Mac
Task.Run (() => StartServer(CancellationToken.None));
}
+ private static IImageEncoder GetImageEncoder(ServerApplicationPaths appPaths, IFileSystem fileSystem, ILogManager logManager)
+ {
+ try
+ {
+ return new SkiaEncoder(logManager.GetLogger("Skia"), appPaths, () => AppHost.HttpClient, fileSystem);
+ }
+ catch (Exception ex)
+ {
+ return new GDIImageEncoder(fileSystem, logManager.GetLogger("GDI"));
+ }
+ }
+
private static void GenerateCertificate(string certPath, string certHost, string certPassword)
{
CertificateGenerator.CreateSelfSignCertificatePfx(certPath, certHost, certPassword, _logger);