Browse Source

add skia to mono project

Luke Pulverenti 8 years ago
parent
commit
74199a889f

+ 10 - 0
MediaBrowser.Server.Mono/ImageEncoderHelper.cs

@@ -8,6 +8,7 @@ using MediaBrowser.Common.Net;
 using MediaBrowser.Controller.Drawing;
 using MediaBrowser.Controller.Drawing;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Model.Logging;
 using MediaBrowser.Model.Logging;
+using Emby.Drawing.Skia;
 
 
 namespace MediaBrowser.Server.Startup.Common
 namespace MediaBrowser.Server.Startup.Common
 {
 {
@@ -22,6 +23,15 @@ namespace MediaBrowser.Server.Startup.Common
         {
         {
             if (!startupOptions.ContainsOption("-enablegdi"))
             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
                 try
                 {
                 {
                     return new ImageMagickEncoder(logManager.GetLogger("ImageMagick"), appPaths, httpClient, fileSystem);
                     return new ImageMagickEncoder(logManager.GetLogger("ImageMagick"), appPaths, httpClient, fileSystem);

+ 4 - 0
MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj

@@ -114,6 +114,10 @@
       <Project>{6cfee013-6e7c-432b-ac37-cabf0880c69a}</Project>
       <Project>{6cfee013-6e7c-432b-ac37-cabf0880c69a}</Project>
       <Name>Emby.Drawing.ImageMagick</Name>
       <Name>Emby.Drawing.ImageMagick</Name>
     </ProjectReference>
     </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">
     <ProjectReference Include="..\Emby.Drawing\Emby.Drawing.csproj">
       <Project>{08fff49b-f175-4807-a2b5-73b0ebd9f716}</Project>
       <Project>{08fff49b-f175-4807-a2b5-73b0ebd9f716}</Project>
       <Name>Emby.Drawing</Name>
       <Name>Emby.Drawing</Name>