diff options
| author | Andrew Rabert <6550543+nvllsvm@users.noreply.github.com> | 2019-01-20 20:49:51 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-20 20:49:51 -0500 |
| commit | edcfd8b565f632088c8b1f826db8e2fbecf9790d (patch) | |
| tree | 26d7da95fe3e3b2772b8b39a2463a6c0ac7652fc /Jellyfin.Server/Program.cs | |
| parent | 803bf563d74754139ff92810364262e3181e399d (diff) | |
| parent | 7327bb91a3bffd1631ffc7368d82d05b286a7f4b (diff) | |
Merge pull request #631 from Bond-009/imagesize
Cleanup ImageProcessor and SkiaEncoder
Diffstat (limited to 'Jellyfin.Server/Program.cs')
| -rw-r--r-- | Jellyfin.Server/Program.cs | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/Jellyfin.Server/Program.cs b/Jellyfin.Server/Program.cs index b1ca3bc40..0510548b5 100644 --- a/Jellyfin.Server/Program.cs +++ b/Jellyfin.Server/Program.cs @@ -14,11 +14,9 @@ using Emby.Server.Implementations.EnvironmentInfo; using Emby.Server.Implementations.IO; using Emby.Server.Implementations.Networking; using MediaBrowser.Common.Configuration; -using MediaBrowser.Common.Net; using MediaBrowser.Controller.Drawing; using MediaBrowser.Model.Globalization; using MediaBrowser.Model.IO; -using MediaBrowser.Model.System; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Logging; using Serilog; @@ -103,7 +101,7 @@ namespace Jellyfin.Server { appHost.Init(); - appHost.ImageProcessor.ImageEncoder = getImageEncoder(fileSystem, () => appHost.HttpClient, appPaths, appHost.LocalizationManager); + appHost.ImageProcessor.ImageEncoder = GetImageEncoder(fileSystem, appPaths, appHost.LocalizationManager); _logger.LogInformation("Running startup tasks"); @@ -256,15 +254,14 @@ namespace Jellyfin.Server } } - public static IImageEncoder getImageEncoder( + public static IImageEncoder GetImageEncoder( IFileSystem fileSystem, - Func<IHttpClient> httpClient, IApplicationPaths appPaths, ILocalizationManager localizationManager) { try { - return new SkiaEncoder(_loggerFactory, appPaths, httpClient, fileSystem, localizationManager); + return new SkiaEncoder(_loggerFactory, appPaths, fileSystem, localizationManager); } catch (Exception ex) { |
