Muldersoft/LameXP
Muldersoft/LameXP
1
0
Fork 0
Code Releases 2 Activity

Refactored all filter classes to use awaitProcess() from Tool_Abstract base class.

Browse Source
This commit is contained in:
LoRd_MuldeR 2017-12-10 22:29:43 +01:00
parent c47a13a494
commit 475d524124
5 changed files with 63 additions and 175 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Config.h
View File

@ -35,7 +35,7 @@
#define VER_LAMEXP_MINOR_LO 6 #define VER_LAMEXP_MINOR_LO 6
#define VER_LAMEXP_TYPE Beta #define VER_LAMEXP_TYPE Beta
#define VER_LAMEXP_PATCH 1 #define VER_LAMEXP_PATCH 1
#define VER_LAMEXP_BUILD 2071 #define VER_LAMEXP_BUILD 2072
#define VER_LAMEXP_CONFG 2002 #define VER_LAMEXP_CONFG 2002
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////

53
src/Filter_Downmix.cpp
View File

@ -105,57 +105,28 @@ AbstractFilter::FilterResult DownmixFilter::apply(const QString &sourceFile, con
return AbstractFilter::FILTER_FAILURE; return AbstractFilter::FILTER_FAILURE;
} }
bool bTimeout = false; int prevProgress = -1;
bool bAborted = false;
QRegExp regExp("In:(\\d+)(\\.\\d+)*%"); QRegExp regExp("In:(\\d+)(\\.\\d+)*%");
while(process.state() != QProcess::NotRunning) const result_t result = awaitProcess(process, abortFlag, [this, &prevProgress, &regExp](const QString &text)
{ {
if(checkFlag(abortFlag)) if (regExp.lastIndexIn(text) >= 0)
{ {
process.kill(); qint32 newProgress;
bAborted = true; if (MUtils::regexp_parse_int32(regExp, newProgress))
emit messageLogged("\nABORTED BY USER !!!");
break;
}
process.waitForReadyRead(m_processTimeoutInterval);
if(!process.bytesAvailable() && process.state() == QProcess::Running)
{ {
process.kill(); if (newProgress > prevProgress)
qWarning("SoX process timed out <-- killing!");
emit messageLogged("\nPROCESS TIMEOUT !!!");
bTimeout = true;
break;
}
while(process.bytesAvailable() > 0)
{ {
QByteArray line = process.readLine(); emit statusUpdated(newProgress);
QString text = QString::fromUtf8(line.constData()).simplified(); prevProgress = (newProgress < 99) ? (newProgress + 1) : newProgress;
if(regExp.lastIndexIn(text) >= 0)
{
bool ok = false;
int progress = regExp.cap(1).toInt(&ok);
if(ok) emit statusUpdated(progress);
}
else if(!text.isEmpty())
{
emit messageLogged(text);
} }
} }
return true;
} }
return false;
});
process.waitForFinished(); if (result != RESULT_SUCCESS)
if(process.state() != QProcess::NotRunning)
{
process.kill();
process.waitForFinished(-1);
}
emit statusUpdated(100);
emit messageLogged(QString().sprintf("\nExited with code: 0x%04X", process.exitCode()));
if(bTimeout || bAborted || process.exitCode() != EXIT_SUCCESS || QFileInfo(outputFile).size() == 0)
{ {
return AbstractFilter::FILTER_FAILURE; return AbstractFilter::FILTER_FAILURE;
} }

53
src/Filter_Normalize.cpp
View File

@ -89,57 +89,28 @@ AbstractFilter::FilterResult NormalizeFilter::apply(const QString &sourceFile, c
return AbstractFilter::FILTER_FAILURE; return AbstractFilter::FILTER_FAILURE;
} }
bool bTimeout = false; int prevProgress = -1;
bool bAborted = false;
QRegExp regExp("In:(\\d+)(\\.\\d+)*%"); QRegExp regExp("In:(\\d+)(\\.\\d+)*%");
while(process.state() != QProcess::NotRunning) const result_t result = awaitProcess(process, abortFlag, [this, &prevProgress, &regExp](const QString &text)
{ {
if(checkFlag(abortFlag)) if (regExp.lastIndexIn(text) >= 0)
{ {
process.kill(); qint32 newProgress;
bAborted = true; if (MUtils::regexp_parse_int32(regExp, newProgress))
emit messageLogged("\nABORTED BY USER !!!");
break;
}
process.waitForReadyRead(m_processTimeoutInterval);
if(!process.bytesAvailable() && process.state() == QProcess::Running)
{ {
process.kill(); if (newProgress > prevProgress)
qWarning("SoX process timed out <-- killing!");
emit messageLogged("\nPROCESS TIMEOUT !!!");
bTimeout = true;
break;
}
while(process.bytesAvailable() > 0)
{ {
QByteArray line = process.readLine(); emit statusUpdated(newProgress);
QString text = QString::fromUtf8(line.constData()).simplified(); prevProgress = (newProgress < 99) ? (newProgress + 1) : newProgress;
if(regExp.lastIndexIn(text) >= 0)
{
bool ok = false;
int progress = regExp.cap(1).toInt(&ok);
if(ok) emit statusUpdated(progress);
}
else if(!text.isEmpty())
{
emit messageLogged(text);
} }
} }
return true;
} }
return false;
});
process.waitForFinished(); if (result != RESULT_SUCCESS)
if(process.state() != QProcess::NotRunning)
{
process.kill();
process.waitForFinished(-1);
}
emit statusUpdated(100);
emit messageLogged(QString().sprintf("\nExited with code: 0x%04X", process.exitCode()));
if(bTimeout || bAborted || process.exitCode() != EXIT_SUCCESS || QFileInfo(outputFile).size() == 0)
{ {
return AbstractFilter::FILTER_FAILURE; return AbstractFilter::FILTER_FAILURE;
} }

61
src/Filter_Resample.cpp
View File

@ -102,65 +102,40 @@ AbstractFilter::FilterResult ResampleFilter::apply(const QString &sourceFile, co
return AbstractFilter::FILTER_FAILURE; return AbstractFilter::FILTER_FAILURE;
} }
bool bTimeout = false; int prevProgress = -1;
bool bAborted = false;
QRegExp regExp("In:(\\d+)(\\.\\d+)*%"); QRegExp regExp("In:(\\d+)(\\.\\d+)*%");
while(process.state() != QProcess::NotRunning) const result_t result = awaitProcess(process, abortFlag, [this, &prevProgress, &regExp](const QString &text)
{ {
if(checkFlag(abortFlag)) if (regExp.lastIndexIn(text) >= 0)
{ {
process.kill(); qint32 newProgress;
bAborted = true; if (MUtils::regexp_parse_int32(regExp, newProgress))
emit messageLogged("\nABORTED BY USER !!!");
break;
}
process.waitForReadyRead(m_processTimeoutInterval);
if(!process.bytesAvailable() && process.state() == QProcess::Running)
{ {
process.kill(); if (newProgress > prevProgress)
qWarning("SoX process timed out <-- killing!");
emit messageLogged("\nPROCESS TIMEOUT !!!");
bTimeout = true;
break;
}
while(process.bytesAvailable() > 0)
{ {
QByteArray line = process.readLine(); emit statusUpdated(newProgress);
QString text = QString::fromUtf8(line.constData()).simplified(); prevProgress = (newProgress < 99) ? (newProgress + 1) : newProgress;
if(regExp.lastIndexIn(text) >= 0)
{
bool ok = false;
int progress = regExp.cap(1).toInt(&ok);
if(ok) emit statusUpdated(progress);
}
else if(!text.isEmpty())
{
emit messageLogged(text);
} }
} }
return true;
} }
return false;
});
process.waitForFinished(); if (result != RESULT_SUCCESS)
if(process.state() != QProcess::NotRunning)
{
process.kill();
process.waitForFinished(-1);
}
emit statusUpdated(100);
emit messageLogged(QString().sprintf("\nExited with code: 0x%04X", process.exitCode()));
if(bTimeout || bAborted || process.exitCode() != EXIT_SUCCESS || QFileInfo(outputFile).size() == 0)
{ {
return AbstractFilter::FILTER_FAILURE; return AbstractFilter::FILTER_FAILURE;
} }
if(m_samplingRate) if (m_samplingRate)
{
formatInfo->setAudioSamplerate(m_samplingRate); formatInfo->setAudioSamplerate(m_samplingRate);
if(m_bitDepth) }
if (m_bitDepth)
{
formatInfo->setAudioBitdepth(m_bitDepth); formatInfo->setAudioBitdepth(m_bitDepth);
}
return AbstractFilter::FILTER_SUCCESS; return AbstractFilter::FILTER_SUCCESS;
} }

53
src/Filter_ToneAdjust.cpp
View File

@ -75,57 +75,28 @@ AbstractFilter::FilterResult ToneAdjustFilter::apply(const QString &sourceFile,
return AbstractFilter::FILTER_FAILURE; return AbstractFilter::FILTER_FAILURE;
} }
bool bTimeout = false; int prevProgress = -1;
bool bAborted = false;
QRegExp regExp("In:(\\d+)(\\.\\d+)*%"); QRegExp regExp("In:(\\d+)(\\.\\d+)*%");
while(process.state() != QProcess::NotRunning) const result_t result = awaitProcess(process, abortFlag, [this, &prevProgress, &regExp](const QString &text)
{ {
if(checkFlag(abortFlag)) if (regExp.lastIndexIn(text) >= 0)
{ {
process.kill(); qint32 newProgress;
bAborted = true; if (MUtils::regexp_parse_int32(regExp, newProgress))
emit messageLogged("\nABORTED BY USER !!!");
break;
}
process.waitForReadyRead(m_processTimeoutInterval);
if(!process.bytesAvailable() && process.state() == QProcess::Running)
{ {
process.kill(); if (newProgress > prevProgress)
qWarning("SoX process timed out <-- killing!");
emit messageLogged("\nPROCESS TIMEOUT !!!");
bTimeout = true;
break;
}
while(process.bytesAvailable() > 0)
{ {
QByteArray line = process.readLine(); emit statusUpdated(newProgress);
QString text = QString::fromUtf8(line.constData()).simplified(); prevProgress = (newProgress < 99) ? (newProgress + 1) : newProgress;
if(regExp.lastIndexIn(text) >= 0)
{
bool ok = false;
int progress = regExp.cap(1).toInt(&ok);
if(ok) emit statusUpdated(progress);
}
else if(!text.isEmpty())
{
emit messageLogged(text);
} }
} }
return true;
} }
return false;
});
process.waitForFinished(); if (result != RESULT_SUCCESS)
if(process.state() != QProcess::NotRunning)
{
process.kill();
process.waitForFinished(-1);
}
emit statusUpdated(100);
emit messageLogged(QString().sprintf("\nExited with code: 0x%04X", process.exitCode()));
if(bTimeout || bAborted || process.exitCode() != EXIT_SUCCESS || QFileInfo(outputFile).size() == 0)
{ {
return AbstractFilter::FILTER_FAILURE; return AbstractFilter::FILTER_FAILURE;
} }