michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

update mac project

Browse Source
This commit is contained in:
Luke Pulverenti 2017-05-13 00:20:52 -04:00
parent cd0d4f419c
commit 375d856dfb
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
MediaBrowser.Server.Mac/Main.cs
View File

@ -32,7 +32,9 @@ using Mono.Unix.Native;
using MediaBrowser.Model.System; using MediaBrowser.Model.System;
using MediaBrowser.Model.IO; using MediaBrowser.Model.IO;
using Emby.Server.Core.Logging; 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 namespace MediaBrowser.Server.Mac
{ {
@ -112,7 +114,7 @@ namespace MediaBrowser.Server.Mac
_fileSystem = fileSystem; _fileSystem = fileSystem;
var imageEncoder = new GDIImageEncoder(fileSystem, logManager.GetLogger("GDI")); var imageEncoder = GetImageEncoder(appPaths, fileSystem, logManager);
AppHost = new MacAppHost(appPaths, AppHost = new MacAppHost(appPaths,
logManager, logManager,
@ -138,6 +140,18 @@ namespace MediaBrowser.Server.Mac
Task.Run (() => StartServer(CancellationToken.None)); 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) private static void GenerateCertificate(string certPath, string certHost, string certPassword)
{ {
CertificateGenerator.CreateSelfSignCertificatePfx(certPath, certHost, certPassword, _logger); CertificateGenerator.CreateSelfSignCertificatePfx(certPath, certHost, certPassword, _logger);