alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-06-03 22:38:30 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Move Options to Jellyfin.Server and create interface file

Browse Source 
Changes following review comments.
This commit is contained in:
PloughPuff
2019-01-28 20:58:47 +00:00
committed by Bond-009
parent ebd2a30087
commit e18b89ca27
8 changed files with 95 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Emby.Server.Implementations/FFMpeg/FFMpegLoader.cs
View File

@@ -6,6 +6,7 @@ using MediaBrowser.Common.Configuration;
using MediaBrowser.Common.Net;
using MediaBrowser.Model.IO;
using Microsoft.Extensions.Logging;
using Emby.Server.Implementations.ParsedStartupOptions;
namespace Emby.Server.Implementations.FFMpeg
{
@@ -28,10 +29,10 @@ namespace Emby.Server.Implementations.FFMpeg
_ffmpegInstallInfo = ffmpegInstallInfo;
}
public FFMpegInfo GetFFMpegInfo(StartupOptions options)
public FFMpegInfo GetFFMpegInfo(IStartupOptions options)
{
var customffMpegPath = options.FFmpeg;
var customffProbePath = options.FFprobe;
var customffMpegPath = options.FFmpegPath;
var customffProbePath = options.FFprobePath;
if (!string.IsNullOrWhiteSpace(customffMpegPath) && !string.IsNullOrWhiteSpace(customffProbePath))
{