aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Model/System
diff options
context:
space:
mode:
authorPloughPuff <ploughpuff@protonmail.com>2019-02-12 22:05:42 +0000
committerPloughpuff <ploughpuff@protonmail.com>2019-03-05 21:29:15 +0000
commited69e690b89e6a3e6e22bbf448af08a25c38e71b (patch)
tree2e90baaef48dec76ffe4cbd53f3722ce960baa52 /MediaBrowser.Model/System
parent20775116f76b12bf77672fa37c4ea5f82b69f157 (diff)
Review comments
Address review comments from JustAMan, Bond-009 and cvium.
Diffstat (limited to 'MediaBrowser.Model/System')
-rw-r--r--MediaBrowser.Model/System/SystemInfo.cs17
1 files changed, 16 insertions, 1 deletions
diff --git a/MediaBrowser.Model/System/SystemInfo.cs b/MediaBrowser.Model/System/SystemInfo.cs
index 581a1069c..6482f2c84 100644
--- a/MediaBrowser.Model/System/SystemInfo.cs
+++ b/MediaBrowser.Model/System/SystemInfo.cs
@@ -5,6 +5,21 @@ using MediaBrowser.Model.Updates;
namespace MediaBrowser.Model.System
{
/// <summary>
+ /// Enum describing the location of the FFmpeg tool.
+ /// </summary>
+ public enum FFmpegLocation
+ {
+ /// <summary>No path to FFmpeg found.</summary>
+ NotFound,
+ /// <summary>Path supplied via command line using switch --ffmpeg.</summary>
+ SetByArgument,
+ /// <summary>User has supplied path via Transcoding UI page.</summary>
+ Custom,
+ /// <summary>FFmpeg tool found on system $PATH.</summary>
+ System
+ };
+
+ /// <summary>
/// Class SystemInfo
/// </summary>
public class SystemInfo : PublicSystemInfo
@@ -122,7 +137,7 @@ namespace MediaBrowser.Model.System
/// <value><c>true</c> if this instance has update available; otherwise, <c>false</c>.</value>
public bool HasUpdateAvailable { get; set; }
- public string EncoderLocationType { get; set; }
+ public FFmpegLocation EncoderLocation { get; set; }
public Architecture SystemArchitecture { get; set; }