mpalyer2.exe also accepted in as mplayer name (in SE folder)

git-svn-id: https://subtitleedit.googlecode.com/svn/trunk@1183 99eadd0c-20b8-1223-b5c4-2a2b2df33de2
This commit is contained in:
niksedk 2012-05-14 18:31:47 +00:00
parent 828f49664f
commit 0cf424323c
2 changed files with 6 additions and 2 deletions

View File

@ -52,7 +52,7 @@ namespace Nikse.SubtitleEdit.Forms
if (Utilities.IsRunningOnLinux() || Utilities.IsRunningOnMac())
{
vlcPath = "cvlc";
parameters = "-vvv --no-sout-video --sout '#transcode{" + Configuration.Settings.General.VlcWaveTranscodeSettings + "}:std{mux=wav,access=file,dst=" + targetFile + "}' \"" + SourceVideoFileName + "\" vlc://quit";
parameters = "-vvv --no-sout-video --sout '#transcode{acodec=s16l}:std{mux=wav,access=file,dst=" + targetFile + "}' \"" + SourceVideoFileName + "\" vlc://quit";
}
else // windows
{

View File

@ -305,7 +305,11 @@ namespace Nikse.SubtitleEdit.Logic.VideoPlayers
if (Utilities.IsRunningOnLinux() || Utilities.IsRunningOnMac())
return "mplayer";
string fileName = Path.Combine(Configuration.BaseDirectory, "mplayer.exe");
string fileName = Path.Combine(Configuration.BaseDirectory, "mplayer2.exe");
if (File.Exists(fileName))
return fileName;
fileName = Path.Combine(Configuration.BaseDirectory, "mplayer.exe");
if (File.Exists(fileName))
return fileName;