alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-07-15 18:53:27 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Removed all old and unused ImageEncoders.

Browse Source 
Remove solution platform cruft.
This commit is contained in:
Erwin de Haan
2019-01-03 21:29:48 +01:00
parent 86275bcc55
commit d15af6eb35
21 changed files with 32 additions and 2163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Jellyfin.Server/Jellyfin.Server.csproj
View File

@@ -35,7 +35,6 @@
<ItemGroup>
<ProjectReference Include="..\Emby.Drawing\Emby.Drawing.csproj" />
<ProjectReference Include="..\Emby.Drawing.ImageMagick\Emby.Drawing.ImageMagick.csproj" />
<ProjectReference Include="..\Emby.Drawing.Skia\Emby.Drawing.Skia.csproj" />
<ProjectReference Include="..\Emby.IsoMounting\IsoMounter\IsoMounter.csproj" />
<ProjectReference Include="..\Emby.Server.Implementations\Emby.Server.Implementations.csproj" />

27
Jellyfin.Server/Program.cs
View File

@@ -1,4 +1,4 @@
using System;
using System;
using System.Diagnostics;
using System.IO;
using System.Linq;
@@ -194,26 +194,13 @@ namespace Jellyfin.Server
IEnvironmentInfo environment,
ILocalizationManager localizationManager)
{
if (!startupOptions.ContainsOption("-enablegdi"))
try
{
try
{
return new SkiaEncoder(logger, appPaths, httpClient, fileSystem, localizationManager);
}
catch (Exception ex)
{
logger.LogInformation(ex, "Skia not available. Will try next image processor. {0}");
}
try
{
return new ImageMagickEncoder(logger, appPaths, httpClient, fileSystem, environment);
}
catch (Exception ex)
{
logger.LogInformation(ex, "ImageMagick not available. Will try next image processor.");
}
_logger.LogInformation("Falling back on NullImageEncoder");
return new SkiaEncoder(logger, appPaths, httpClient, fileSystem, localizationManager);
}
catch (Exception ex)
{
logger.LogInformation(ex, "Skia not available. Will fallback to NullIMageEncoder. {0}");
}
return new NullImageEncoder();