Mirrors/SubtitleEdit
1
0
Fork 0
mirror of https://github.com/SubtitleEdit/subtitleedit.git synced 2024-10-28 06:52:35 +01:00
Code Issues Projects Releases Wiki Activity

Mpc-hc detection fixes

Browse Source
This commit is contained in:
niksedk 2014-10-14 13:52:14 +02:00
parent 5978fe473b
commit e733860ff9
3 changed files with 615 additions and 594 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

395
src/Forms/Settings.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

2
src/Forms/Settings.cs
View File

@ -138,6 +138,8 @@ namespace Nikse.SubtitleEdit.Forms
radioButtonVideoPlayerMPlayer.Enabled = false;
if (!Utilities.IsQuartsDllInstalled)
radioButtonVideoPlayerDirectShow.Enabled = false;
if (Nikse.SubtitleEdit.Logic.VideoPlayers.MpcHC.MpcHc.GetMpcHcFileName() == null)
radioButtonVideoPlayerMpcHc.Enabled = false;
textBoxVlcPath.Text = Configuration.Settings.General.VlcLocation;
textBoxVlcPath.Left = labelVideoPlayerVLC.Left + labelVideoPlayerVLC.Width + 5;

16
src/Logic/VideoPlayers/MpcHC/MpcHc.cs
View File

@ -256,10 +256,18 @@ namespace Nikse.SubtitleEdit.Logic.VideoPlayers.MpcHC
return path;
}
path = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles), @"MPC-HC\mpc-hc64.exe");
if (File.Exists(path))
return path;
path = @"C:\Program Files\MPC-HC\mpc-hc64.exe";
if (File.Exists(path))
return path;
path = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles), @"K-Lite Codec Pack\MPC-HC\mpc-hc64.exe");
if (File.Exists(path))
return path;
path = @"C:\Program Files (x86)\MPC-HC\mpc-hc64.exe";
if (File.Exists(path))
return path;
@ -285,10 +293,18 @@ namespace Nikse.SubtitleEdit.Logic.VideoPlayers.MpcHC
return path;
}
path = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles), @"MPC-HC\mpc-hc.exe");
if (File.Exists(path))
return path;
path = @"C:\Program Files (x86)\MPC-HC\mpc-hc.exe";
if (File.Exists(path))
return path;
path = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles), @"K-Lite Codec Pack\MPC-HC\mpc-hc.exe");
if (File.Exists(path))
return path;
path = @"C:\Program Files\MPC-HC\mpc-hc.exe";
if (File.Exists(path))
return path;