Jelajahi Sumber

Renamed Init() to SetFFmpegPath()

PloughPuff 6 tahun lalu
induk
melakukan
2617a49b78

+ 1 - 1
Emby.Server.Implementations/ApplicationHost.cs

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

+ 1 - 1
MediaBrowser.Controller/MediaEncoding/IMediaEncoder.cs

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

+ 3 - 3
MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs

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