Updated Valdec decoder binary to v1.4.0a (2013-03-17).

[lamexp/LameXP.git] / src / Filter_Normalize.cpp

diff --git a/src/Filter_Normalize.cpp b/src/Filter_Normalize.cpp
index ccc9a14..05024d6 100644 (file)
--- a/src/Filter_Normalize.cpp
+++ b/src/Filter_Normalize.cpp
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 // LameXP - Audio Encoder Front-End
-// Copyright (C) 2004-2011 LoRd_MuldeR <MuldeR2@GMX.de>
+// Copyright (C) 2004-2013 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
@@ -27,7 +27,7 @@
 #include <QProcess>
 #include <QRegExp>
 
-NormalizeFilter::NormalizeFilter(int peakVolume)
+NormalizeFilter::NormalizeFilter(int peakVolume, int equalizationMode)
 :
        m_binary(lamexp_lookup_tool("sox.exe"))
 {
@@ -36,26 +36,28 @@ NormalizeFilter::NormalizeFilter(int peakVolume)
                throw "Error initializing SoX filter. Tool 'sox.exe' is not registred!";
        }
 
-       m_peakVolume = min(-50, max(-3200, peakVolume));
+       m_peakVolume = qMin(-50, qMax(-3200, peakVolume));
+       m_equalizationMode = qMin(2, qMax(0, equalizationMode));
 }
 
 NormalizeFilter::~NormalizeFilter(void)
 {
 }
 
-bool NormalizeFilter::apply(const QString &sourceFile, const QString &outputFile, volatile bool *abortFlag)
+bool NormalizeFilter::apply(const QString &sourceFile, const QString &outputFile, AudioFileModel *formatInfo, volatile bool *abortFlag)
 {
        QProcess process;
        QStringList args;
+       QString eqMode = (m_equalizationMode == 0) ? "-n" : ((m_equalizationMode == 1) ? "-ne" : "-nb");
 
-       process.setWorkingDirectory(lamexp_temp_folder());
+       process.setWorkingDirectory(QFileInfo(outputFile).canonicalPath());
 
-       args << "-V3";
+       args << "-V3" << "-S";
        args << "--temp" << ".";
        args << QDir::toNativeSeparators(sourceFile);
        args << QDir::toNativeSeparators(outputFile);
        args << "gain";
-       args << "-n" << QString().sprintf("%.2f", static_cast<double>(m_peakVolume) / 100.0);
+       args << eqMode << QString().sprintf("%.2f", static_cast<double>(m_peakVolume) / 100.0);
 
        if(!startProcess(process, m_binary, args))
        {
@@ -65,6 +67,8 @@ bool NormalizeFilter::apply(const QString &sourceFile, const QString &outputFile
        bool bTimeout = false;
        bool bAborted = false;
 
+       QRegExp regExp("In:(\\d+)(\\.\\d+)*%");
+
        while(process.state() != QProcess::NotRunning)
        {
                if(*abortFlag)
@@ -74,11 +78,12 @@ bool NormalizeFilter::apply(const QString &sourceFile, const QString &outputFile
                        emit messageLogged("\nABORTED BY USER !!!");
                        break;
                }
-               process.waitForReadyRead();
+               process.waitForReadyRead(m_processTimeoutInterval);
                if(!process.bytesAvailable() && process.state() == QProcess::Running)
                {
                        process.kill();
                        qWarning("SoX process timed out <-- killing!");
+                       emit messageLogged("\nPROCESS TIMEOUT !!!");
                        bTimeout = true;
                        break;
                }
@@ -86,7 +91,13 @@ bool NormalizeFilter::apply(const QString &sourceFile, const QString &outputFile
                {
                        QByteArray line = process.readLine();
                        QString text = QString::fromUtf8(line.constData()).simplified();
-                       if(!text.isEmpty())
+                       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);
                        }
@@ -103,7 +114,7 @@ bool NormalizeFilter::apply(const QString &sourceFile, const QString &outputFile
        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;
        }