Renamed Init() to SetFFmpegPath()

pull/844/head
PloughPuff 5 years ago committed by Ploughpuff
parent 656bffbbb2
commit 2617a49b78

@ -534,7 +534,7 @@ namespace Emby.Server.Implementations
ConfigurationManager.ConfigurationUpdated += OnConfigurationUpdated;
MediaEncoder.Init();
MediaEncoder.SetFFmpegPath();
//if (string.IsNullOrWhiteSpace(MediaEncoder.EncoderPath))
//{

@ -92,7 +92,7 @@ namespace MediaBrowser.Controller.MediaEncoding
/// <returns>System.String.</returns>
string EscapeSubtitleFilterPath(string path);
void Init();
void SetFFmpegPath();
void UpdateEncoderPath(string path, string pathType);
bool SupportsEncoder(string encoder);

@ -84,7 +84,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
/// Sets global variables FFmpegPath.
/// Precedence is: Config > CLI > $PATH
/// </summary>
public void Init()
public void SetFFmpegPath()
{
// ToDo - Finalise removal of the --ffprobe switch
if (!string.IsNullOrEmpty(StartupOptionFFprobePath))
@ -169,8 +169,8 @@ namespace MediaBrowser.MediaEncoding.Encoder
config.EncoderAppPath = newPath;
ConfigurationManager.SaveConfiguration("encoding", config);
// Trigger Init so we validate the new path and setup probe path
Init();
// Trigger SetFFmpegPath so we validate the new path and setup probe path
SetFFmpegPath();
}
/// <summary>

Loading…
Cancel
Save