aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
diff options
context:
space:
mode:
authorLuke <luke.pulverenti@gmail.com>2016-08-24 11:49:22 -0400
committerGitHub <noreply@github.com>2016-08-24 11:49:22 -0400
commit20c400fee3c55b64ff8b71b166b8a249d5c25301 (patch)
tree44409ac47142998dd8866bc580d5594846dca72b /MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
parentf4bc4f473ac8567df5473443d7453c8afa34bdf5 (diff)
parente03ead01aea85fdc2ace162ab4daa94248ec6909 (diff)
Merge pull request #2095 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs')
-rw-r--r--MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs16
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)