From ed69e690b89e6a3e6e22bbf448af08a25c38e71b Mon Sep 17 00:00:00 2001
From: PloughPuff <ploughpuff@protonmail.com>
Date: Tue, 12 Feb 2019 22:05:42 +0000
Subject: Review comments

Address review comments from JustAMan, Bond-009 and cvium.
---
 MediaBrowser.Controller/MediaEncoding/IMediaEncoder.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'MediaBrowser.Controller/MediaEncoding/IMediaEncoder.cs')

diff --git a/MediaBrowser.Controller/MediaEncoding/IMediaEncoder.cs b/MediaBrowser.Controller/MediaEncoding/IMediaEncoder.cs
index 057e43910..8852dac05 100644
--- a/MediaBrowser.Controller/MediaEncoding/IMediaEncoder.cs
+++ b/MediaBrowser.Controller/MediaEncoding/IMediaEncoder.cs
@@ -6,6 +6,7 @@ using MediaBrowser.Model.Dlna;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Model.MediaInfo;
+using MediaBrowser.Model.System;
 
 namespace MediaBrowser.Controller.MediaEncoding
 {
@@ -14,7 +15,7 @@ namespace MediaBrowser.Controller.MediaEncoding
     /// </summary>
     public interface IMediaEncoder : ITranscoderSupport
     {
-        string EncoderLocationType { get; }
+        FFmpegLocation EncoderLocation { get; }
 
         /// <summary>
         /// Gets the encoder path.
-- 
cgit v1.2.3


From 2617a49b78c99f72ba36e53a4c97c4e042116a53 Mon Sep 17 00:00:00 2001
From: PloughPuff <ploughpuff@protonmail.com>
Date: Thu, 28 Feb 2019 22:47:56 +0000
Subject: Renamed Init() to SetFFmpegPath()

---
 Emby.Server.Implementations/ApplicationHost.cs         | 2 +-
 MediaBrowser.Controller/MediaEncoding/IMediaEncoder.cs | 2 +-
 MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs     | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'MediaBrowser.Controller/MediaEncoding/IMediaEncoder.cs')

diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs
index dd29f2ade..325df3293 100644
--- a/Emby.Server.Implementations/ApplicationHost.cs
+++ b/Emby.Server.Implementations/ApplicationHost.cs
@@ -534,7 +534,7 @@ namespace Emby.Server.Implementations
 
             ConfigurationManager.ConfigurationUpdated += OnConfigurationUpdated;
 
-            MediaEncoder.Init();
+            MediaEncoder.SetFFmpegPath();
 
             //if (string.IsNullOrWhiteSpace(MediaEncoder.EncoderPath))
             //{
diff --git a/MediaBrowser.Controller/MediaEncoding/IMediaEncoder.cs b/MediaBrowser.Controller/MediaEncoding/IMediaEncoder.cs
index 8852dac05..d4ac3b7c3 100644
--- a/MediaBrowser.Controller/MediaEncoding/IMediaEncoder.cs
+++ b/MediaBrowser.Controller/MediaEncoding/IMediaEncoder.cs
@@ -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);
diff --git a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
index 51b4f6e39..292457788 100644
--- a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
@@ -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>
-- 
cgit v1.2.3