///////////////////////////////////////////////////////////////////////////////
// LameXP - Audio Encoder Front-End
-// Copyright (C) 2004-2011 LoRd_MuldeR <MuldeR2@GMX.de>
+// Copyright (C) 2004-2014 LoRd_MuldeR <MuldeR2@GMX.de>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
+// (at your option) any later version, but always including the *additional*
+// restrictions defined in the "License.txt" file.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
#include "Decoder_Vorbis.h"
+//Internal
#include "Global.h"
+//MUtils
+#include <MUtils/Exception.h>
+
+//Qt
#include <QDir>
#include <QProcess>
#include <QRegExp>
VorbisDecoder::VorbisDecoder(void)
:
- m_binary(lamexp_lookup_tool("oggdec.exe"))
+ m_binary(lamexp_tool_lookup("oggdec.exe"))
{
if(m_binary.isEmpty())
{
- throw "Error initializing Vorbis decoder. Tool 'oggdec.exe' is not registred!";
+ MUTILS_THROW("Error initializing Vorbis decoder. Tool 'oggdec.exe' is not registred!");
}
}
bool bTimeout = false;
bool bAborted = false;
+ int prevProgress = -1;
QRegExp regExp(" (\\d+)% decoded.");
emit messageLogged("\nABORTED BY USER !!!");
break;
}
- process.waitForReadyRead();
+ process.waitForReadyRead(m_processTimeoutInterval);
if(!process.bytesAvailable() && process.state() == QProcess::Running)
{
process.kill();
qWarning("OggDec process timed out <-- killing!");
+ emit messageLogged("\nPROCESS TIMEOUT !!!");
bTimeout = true;
break;
}
{
bool ok = false;
int progress = regExp.cap(1).toInt(&ok);
- if(ok) emit statusUpdated(progress);
+ if(ok && (progress > prevProgress))
+ {
+ emit statusUpdated(progress);
+ prevProgress = qMin(progress + 2, 99);
+ }
}
else if(!text.isEmpty())
{
emit statusUpdated(100);
emit messageLogged(QString().sprintf("\nExited with code: 0x%04X", process.exitCode()));
- if(bTimeout || bAborted || process.exitStatus() != QProcess::NormalExit || QFileInfo(outputFile).size() == 0)
+ if(bTimeout || bAborted || process.exitCode() != EXIT_SUCCESS || QFileInfo(outputFile).size() == 0)
{
return false;
}