diff options
| author | Luke <luke.pulverenti@gmail.com> | 2016-08-24 11:49:22 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-24 11:49:22 -0400 |
| commit | 20c400fee3c55b64ff8b71b166b8a249d5c25301 (patch) | |
| tree | 44409ac47142998dd8866bc580d5594846dca72b /MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs | |
| parent | f4bc4f473ac8567df5473443d7453c8afa34bdf5 (diff) | |
| parent | e03ead01aea85fdc2ace162ab4daa94248ec6909 (diff) | |
Merge pull request #2095 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs')
| -rw-r--r-- | MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs index f488be11a..ad84ffee8 100644 --- a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs +++ b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs @@ -123,20 +123,20 @@ namespace MediaBrowser.MediaEncoding.Encoder return "System"; } - if (IsDefaultPath(FFMpegPath)) - { - return "Default"; - } - return "Custom"; } } - private bool IsDefaultPath(string path) + public bool IsDefaultEncoderPath { - var parentPath = Path.Combine(ConfigurationManager.ApplicationPaths.ProgramDataPath, "ffmpeg", "20160410"); + get + { + var path = FFMpegPath; + + var parentPath = Path.Combine(ConfigurationManager.ApplicationPaths.ProgramDataPath, "ffmpeg", "20160410"); - return FileSystem.ContainsSubPath(parentPath, path); + return FileSystem.ContainsSubPath(parentPath, path); + } } private bool IsSystemInstalledPath(string path) |
