diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2017-06-06 02:13:07 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2017-06-06 02:13:07 -0400 |
| commit | 74199a889fe9c216fae001d22839b25970dbf2df (patch) | |
| tree | 027fd86373144ef6e7fee4974225e6670414cf86 | |
| parent | 8d374353445cd3848ec08473eb636a19192700fb (diff) | |
add skia to mono project
| -rw-r--r-- | MediaBrowser.Server.Mono/ImageEncoderHelper.cs | 10 | ||||
| -rw-r--r-- | MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj | 4 |
2 files changed, 14 insertions, 0 deletions
diff --git a/MediaBrowser.Server.Mono/ImageEncoderHelper.cs b/MediaBrowser.Server.Mono/ImageEncoderHelper.cs index 2f7f2a45c..ee0c00065 100644 --- a/MediaBrowser.Server.Mono/ImageEncoderHelper.cs +++ b/MediaBrowser.Server.Mono/ImageEncoderHelper.cs @@ -8,6 +8,7 @@ using MediaBrowser.Common.Net; using MediaBrowser.Controller.Drawing; using MediaBrowser.Model.IO; using MediaBrowser.Model.Logging; +using Emby.Drawing.Skia; namespace MediaBrowser.Server.Startup.Common { @@ -22,6 +23,15 @@ namespace MediaBrowser.Server.Startup.Common { if (!startupOptions.ContainsOption("-enablegdi")) { + //try + //{ + // return new SkiaEncoder(logManager.GetLogger("Skia"), appPaths, httpClient, fileSystem); + //} + //catch + //{ + // logger.Error("Error loading Skia. Will revert to ImageMagick."); + //} + try { return new ImageMagickEncoder(logManager.GetLogger("ImageMagick"), appPaths, httpClient, fileSystem); diff --git a/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj b/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj index ed5e4d96e..96afcec09 100644 --- a/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj +++ b/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj @@ -114,6 +114,10 @@ <Project>{6cfee013-6e7c-432b-ac37-cabf0880c69a}</Project> <Name>Emby.Drawing.ImageMagick</Name> </ProjectReference> + <ProjectReference Include="..\Emby.Drawing.Skia\Emby.Drawing.Skia.csproj"> + <Project>{2312da6d-ff86-4597-9777-bceec32d96dd}</Project> + <Name>Emby.Drawing.Skia</Name> + </ProjectReference> <ProjectReference Include="..\Emby.Drawing\Emby.Drawing.csproj"> <Project>{08fff49b-f175-4807-a2b5-73b0ebd9f716}</Project> <Name>Emby.Drawing</Name> |