diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2017-05-16 01:44:06 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2017-05-16 01:44:06 -0400 |
| commit | 404171023f4dd4a1c55ceda7a6f1e8bd50c0c996 (patch) | |
| tree | c156a6a4776b8ebf79b19a2c4049f4bffb673a77 /MediaBrowser.ServerApplication/ImageEncoderHelper.cs | |
| parent | a3225ed810cb55089447496c3cdbd48d1b062f4c (diff) | |
clean up build configs
Diffstat (limited to 'MediaBrowser.ServerApplication/ImageEncoderHelper.cs')
| -rw-r--r-- | MediaBrowser.ServerApplication/ImageEncoderHelper.cs | 29 |
1 files changed, 8 insertions, 21 deletions
diff --git a/MediaBrowser.ServerApplication/ImageEncoderHelper.cs b/MediaBrowser.ServerApplication/ImageEncoderHelper.cs index b8fa097d6..a6651ea40 100644 --- a/MediaBrowser.ServerApplication/ImageEncoderHelper.cs +++ b/MediaBrowser.ServerApplication/ImageEncoderHelper.cs @@ -1,6 +1,5 @@ using System; using Emby.Drawing; -using Emby.Drawing.Net; using Emby.Drawing.ImageMagick; using Emby.Drawing.Skia; using Emby.Server.Core; @@ -22,34 +21,22 @@ namespace MediaBrowser.Server.Startup.Common Func<IHttpClient> httpClient, IApplicationPaths appPaths) { - if (!startupOptions.ContainsOption("-enablegdi")) + try { - 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); - } - catch - { - logger.Error("Error loading ImageMagick. Will revert to GDI."); - } + return new SkiaEncoder(logManager.GetLogger("Skia"), appPaths, httpClient, fileSystem); + } + catch + { + logger.Error("Error loading Skia. Will revert to ImageMagick."); } try { - return new GDIImageEncoder(fileSystem, logManager.GetLogger("GDI")); + return new ImageMagickEncoder(logManager.GetLogger("ImageMagick"), appPaths, httpClient, fileSystem); } catch { - logger.Error("Error loading GDI. Will revert to NullImageEncoder."); + logger.Error("Error loading ImageMagick. Will revert to GDI."); } return new NullImageEncoder(); |
