Updated Monkey's Audio binaries to v5.54 (2020-08-24), compiled with ICL 19.1 and...

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

diff --git a/src/Filter_Downmix.cpp b/src/Filter_Downmix.cpp
index 53596f2..c988be7 100644 (file)
--- a/src/Filter_Downmix.cpp
+++ b/src/Filter_Downmix.cpp
@@ -1,11 +1,12 @@
 ///////////////////////////////////////////////////////////////////////////////
 // LameXP - Audio Encoder Front-End
-// Copyright (C) 2004-2012 LoRd_MuldeR <MuldeR2@GMX.de>
+// Copyright (C) 2004-2020 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
+// 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; always including the non-optional
+// LAMEXP GNU GENERAL PUBLIC LICENSE ADDENDUM. See "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
@@ -21,21 +22,28 @@
 
 #include "Filter_Downmix.h"
 
+//Internal
 #include "Global.h"
 #include "Tool_WaveProperties.h"
 #include "Model_AudioFile.h"
 
+//MUtils
+#include <MUtils/Exception.h>
+
+//Qt
 #include <QDir>
 #include <QProcess>
 #include <QRegExp>
 
+#define IS_VALID(X) (((X) != 0U) && ((X) != UINT_MAX))
+
 DownmixFilter::DownmixFilter(void)
 :
-       m_binary(lamexp_lookup_tool("sox.exe"))
+       m_binary(lamexp_tools_lookup("sox.exe"))
 {
        if(m_binary.isEmpty())
        {
-               throw "Error initializing SoX filter. Tool 'sox.exe' is not registred!";
+               MUTILS_THROW("Error initializing SoX filter. Tool 'sox.exe' is not registred!");
        }
 }
 
@@ -43,23 +51,21 @@ DownmixFilter::~DownmixFilter(void)
 {
 }
 
-bool DownmixFilter::apply(const QString &sourceFile, const QString &outputFile, AudioFileModel *formatInfo, volatile bool *abortFlag)
+AbstractFilter::FilterResult DownmixFilter::apply(const QString &sourceFile, const QString &outputFile, AudioFileModel_TechInfo *const formatInfo, QAtomicInt &abortFlag)
 {
-       unsigned int channels = formatInfo->formatAudioChannels(); //detectChannels(sourceFile, abortFlag);
+       unsigned int channels = formatInfo->audioChannels();
        emit messageLogged(QString().sprintf("--> Number of channels is: %d\n", channels));
 
-       if((channels == 1) || (channels == 2))
+       if(IS_VALID(channels) && (channels <= 2))
        {
                messageLogged("Skipping downmix!");
-               qDebug("Dowmmix not required for Mono or Stereo input, skipping!");
-               return true;
+               qDebug("Dowmmix not required/possible for Mono or Stereo input, skipping!");
+               return AbstractFilter::FILTER_SKIPPED;
        }
 
        QProcess process;
        QStringList args;
 
-       process.setWorkingDirectory(QFileInfo(outputFile).canonicalPath());
-
        args << "-V3" << "-S";
        args << "--guard" << "--temp" << ".";
        args << QDir::toNativeSeparators(sourceFile);
@@ -90,70 +96,41 @@ bool DownmixFilter::apply(const QString &sourceFile, const QString &outputFile,
                break;
        default: //Unknown
                qWarning("Downmixer: Unknown channel configuration!");
-               args << "channels" << "2";
+               args << "channels" << QString::number(2);
                break;
        }
 
-       if(!startProcess(process, m_binary, args))
+       if(!startProcess(process, m_binary, args, QFileInfo(outputFile).canonicalPath()))
        {
-               return false;
+               return AbstractFilter::FILTER_FAILURE;
        }
 
-       bool bTimeout = false;
-       bool bAborted = false;
-
+       int prevProgress = -1;
        QRegExp regExp("In:(\\d+)(\\.\\d+)*%");
 
-       while(process.state() != QProcess::NotRunning)
+       const result_t result = awaitProcess(process, abortFlag, [this, &prevProgress, &regExp](const QString &text)
        {
-               if(*abortFlag)
-               {
-                       process.kill();
-                       bAborted = true;
-                       emit messageLogged("\nABORTED BY USER !!!");
-                       break;
-               }
-               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;
-               }
-               while(process.bytesAvailable() > 0)
+               if (regExp.lastIndexIn(text) >= 0)
                {
-                       QByteArray line = process.readLine();
-                       QString text = QString::fromUtf8(line.constData()).simplified();
-                       if(regExp.lastIndexIn(text) >= 0)
+                       qint32 newProgress;
+                       if (MUtils::regexp_parse_int32(regExp, newProgress))
                        {
-                               bool ok = false;
-                               int progress = regExp.cap(1).toInt(&ok);
-                               if(ok) emit statusUpdated(progress);
-                       }
-                       else if(!text.isEmpty())
-                       {
-                               emit messageLogged(text);
+                               if (newProgress > prevProgress)
+                               {
+                                       emit statusUpdated(newProgress);
+                                       prevProgress = NEXT_PROGRESS(newProgress);
+                               }
                        }
+                       return true;
                }
-       }
-
-       process.waitForFinished();
-       if(process.state() != QProcess::NotRunning)
-       {
-               process.kill();
-               process.waitForFinished(-1);
-       }
-       
-       emit statusUpdated(100);
-       emit messageLogged(QString().sprintf("\nExited with code: 0x%04X", process.exitCode()));
+               return false;
+       });
 
-       if(bTimeout || bAborted || process.exitCode() != EXIT_SUCCESS || QFileInfo(outputFile).size() == 0)
+       if (result != RESULT_SUCCESS)
        {
-               return false;
+               return AbstractFilter::FILTER_FAILURE;
        }
        
-       formatInfo->setFormatAudioChannels(2);
-       return true;
+       formatInfo->setAudioChannels(2);
+       return AbstractFilter::FILTER_SUCCESS;
 }