Updated documents.

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

diff --git a/src/Filter_Downmix.cpp b/src/Filter_Downmix.cpp
index 0784cee..c480421 100644 (file)
--- a/src/Filter_Downmix.cpp
+++ b/src/Filter_Downmix.cpp
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 // LameXP - Audio Encoder Front-End
-// Copyright (C) 2004-2011 LoRd_MuldeR <MuldeR2@GMX.de>
+// Copyright (C) 2004-2012 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
@@ -22,6 +22,8 @@
 #include "Filter_Downmix.h"
 
 #include "Global.h"
+#include "Tool_WaveProperties.h"
+#include "Model_AudioFile.h"
 
 #include <QDir>
 #include <QProcess>
@@ -41,16 +43,16 @@ DownmixFilter::~DownmixFilter(void)
 {
 }
 
-bool DownmixFilter::apply(const QString &sourceFile, const QString &outputFile, volatile bool *abortFlag)
+bool DownmixFilter::apply(const QString &sourceFile, const QString &outputFile, AudioFileModel *formatInfo, volatile bool *abortFlag)
 {
-       unsigned int channels = detectChannels(sourceFile, abortFlag);
+       unsigned int channels = formatInfo->formatAudioChannels(); //detectChannels(sourceFile, abortFlag);
        emit messageLogged(QString().sprintf("--> Number of channels is: %d\n", channels));
 
-       if((channels == 1) || (channels == 2))
+       if(channels == 2)
        {
                messageLogged("Skipping downmix!");
-               qDebug("Dowmmix not required for Mono or Stereo input, skipping!");
-               return false;
+               qDebug("Dowmmix not required for Stereo input, skipping!");
+               return true;
        }
 
        QProcess process;
@@ -65,6 +67,8 @@ bool DownmixFilter::apply(const QString &sourceFile, const QString &outputFile,
 
        switch(channels)
        {
+       case 2: //Unknown
+               qWarning("Downmixer: Nothing to do!");
        case 3: //3.0 (L/R/C)
                args << "remix" << "1v0.66,3v0.34" << "2v0.66,3v0.34";
                break;
@@ -147,74 +151,11 @@ bool DownmixFilter::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;
        }
        
+       formatInfo->setFormatAudioChannels(2);
        return true;
 }
-
-unsigned int DownmixFilter::detectChannels(const QString &sourceFile, volatile bool *abortFlag)
-{
-       unsigned int channels = 0;
-       
-       QProcess process;
-       QStringList args;
-
-       args << "--i" << sourceFile;
-
-       if(!startProcess(process, m_binary, args))
-       {
-               return channels;
-       }
-
-       bool bTimeout = false;
-       bool bAborted = false;
-
-       QRegExp regExp("Channels\\s*:\\s*(\\d+)", Qt::CaseInsensitive);
-
-       while(process.state() != QProcess::NotRunning)
-       {
-               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)
-               {
-                       QByteArray line = process.readLine();
-                       QString text = QString::fromUtf8(line.constData()).simplified();
-                       if(regExp.lastIndexIn(text) >= 0)
-                       {
-                               bool ok = false;
-                               unsigned int temp = regExp.cap(1).toUInt(&ok);
-                               if(ok) channels = temp;
-                       }
-                       if(!text.isEmpty())
-                       {
-                               emit messageLogged(text);
-                       }
-               }
-       }
-
-       process.waitForFinished();
-       if(process.state() != QProcess::NotRunning)
-       {
-               process.kill();
-               process.waitForFinished(-1);
-       }
-
-       return channels;
-}