diff options
| author | Luke <luke.pulverenti@gmail.com> | 2017-05-12 14:16:25 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-12 14:16:25 -0400 |
| commit | 3cdb75190d457cbb3bed91bf79bfb4816cad29e2 (patch) | |
| tree | 558b953b1e01a16bd47d902c841cc747a50e0ae7 /Emby.Server.Core/ApplicationHost.cs | |
| parent | 275fe6622056d134fdf4737319507c4c51d3f389 (diff) | |
| parent | 2e3d1780e48c75ac90fc92d17648b2db6c70e94c (diff) | |
Merge pull request #2632 from MediaBrowser/dev
update dlna profiles
Diffstat (limited to 'Emby.Server.Core/ApplicationHost.cs')
| -rw-r--r-- | Emby.Server.Core/ApplicationHost.cs | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/Emby.Server.Core/ApplicationHost.cs b/Emby.Server.Core/ApplicationHost.cs index 5ceef0754..0fe30eb80 100644 --- a/Emby.Server.Core/ApplicationHost.cs +++ b/Emby.Server.Core/ApplicationHost.cs @@ -187,7 +187,7 @@ namespace Emby.Server.Core /// <value>The HTTP server.</value> private IHttpServer HttpServer { get; set; } private IDtoService DtoService { get; set; } - private IImageProcessor ImageProcessor { get; set; } + public IImageProcessor ImageProcessor { get; set; } /// <summary> /// Gets or sets the media encoder. @@ -783,14 +783,7 @@ namespace Emby.Server.Core private IImageProcessor GetImageProcessor() { - var maxConcurrentImageProcesses = Math.Max(Environment.ProcessorCount, 4); - - if (StartupOptions.ContainsOption("-imagethreads")) - { - int.TryParse(StartupOptions.GetOption("-imagethreads"), NumberStyles.Any, CultureInfo.InvariantCulture, out maxConcurrentImageProcesses); - } - - return new ImageProcessor(LogManager.GetLogger("ImageProcessor"), ServerConfigurationManager.ApplicationPaths, FileSystemManager, JsonSerializer, ImageEncoder, maxConcurrentImageProcesses, () => LibraryManager, TimerFactory); + return new ImageProcessor(LogManager.GetLogger("ImageProcessor"), ServerConfigurationManager.ApplicationPaths, FileSystemManager, JsonSerializer, ImageEncoder, () => LibraryManager, TimerFactory); } protected virtual FFMpegInstallInfo GetFfmpegInstallInfo() |
