Bump version.

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

diff --git a/src/Encoder_DCA.cpp b/src/Encoder_DCA.cpp
index 61a2097..565d26b 100644 (file)
--- a/src/Encoder_DCA.cpp
+++ b/src/Encoder_DCA.cpp
@@ -1,12 +1,12 @@
 ///////////////////////////////////////////////////////////////////////////////
 // LameXP - Audio Encoder Front-End
-// Copyright (C) 2004-2016 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, but always including the *additional*
-// restrictions defined in the "License.txt" file.
+// (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
@@ -115,6 +115,11 @@ class DCAEncoderInfo : public AbstractEncoderInfo
                static const char* s_extension = "dts";
                return s_extension;
        }
+
+       virtual bool isResamplingSupported(void) const
+       {
+               return false;
+       }
 }
 static const g_dcaEncoderInfo;
 
@@ -124,7 +129,7 @@ static const g_dcaEncoderInfo;
 
 DCAEncoder::DCAEncoder(void)
 :
-       m_binary(lamexp_tools_lookup("dcaenc.exe"))
+       m_binary(lamexp_tools_lookup(L1S("dcaenc.exe")))
 {
        if(m_binary.isEmpty())
        {
@@ -136,88 +141,49 @@ DCAEncoder::~DCAEncoder(void)
 {
 }
 
-bool DCAEncoder::encode(const QString &sourceFile, const AudioFileModel_MetaInfo &metaInfo, const unsigned int duration, const QString &outputFile, volatile bool *abortFlag)
+bool DCAEncoder::encode(const QString &sourceFile, const AudioFileModel_MetaInfo &metaInfo, const unsigned int duration, const unsigned int channels, const QString &outputFile, QAtomicInt &abortFlag)
 {
        QProcess process;
        QStringList args;
 
-       args << "-i" << QDir::toNativeSeparators(sourceFile);
-       args << "-o" << QDir::toNativeSeparators(outputFile);
-       args << "-b" << QString::number(qBound(32, index2bitrate(m_configBitrate), 4096));
+       args << L1S("-i") << QDir::toNativeSeparators(sourceFile);
+       args << L1S("-o") << QDir::toNativeSeparators(outputFile);
+       args << L1S("-b") << QString::number(qBound(32, index2bitrate(m_configBitrate), 4096));
 
        if(!startProcess(process, m_binary, args))
        {
                return false;
        }
 
-       bool bTimeout = false;
-       bool bAborted = false;
        int prevProgress = -1;
+       QRegExp regExp(L1S("\\[(\\d+)\\.(\\d+)%\\]"));
 
-       QRegExp regExp("\\[(\\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("DCAENC 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 && (progress > prevProgress))
+                               if (newProgress > prevProgress)
                                {
-                                       emit statusUpdated(progress);
-                                       prevProgress = qMin(progress + 2, 99);
+                                       emit statusUpdated(newProgress);
+                                       prevProgress = NEXT_PROGRESS(newProgress);
                                }
                        }
-                       else if(!text.isEmpty())
-                       {
-                               emit messageLogged(text);
-                       }
+                       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()));
-
-       if(bTimeout || bAborted || process.exitCode() != EXIT_SUCCESS)
-       {
                return false;
-       }
+       });
        
-       return true;
+       return (result == RESULT_SUCCESS);
 }
 
 bool DCAEncoder::isFormatSupported(const QString &containerType, const QString &containerProfile, const QString &formatType, const QString &formatProfile, const QString &formatVersion)
 {
-       if(containerType.compare("Wave", Qt::CaseInsensitive) == 0)
+       if(containerType.compare(L1S("Wave"), Qt::CaseInsensitive) == 0)
        {
-               if(formatType.compare("PCM", Qt::CaseInsensitive) == 0)
+               if(formatType.compare(L1S("PCM"), Qt::CaseInsensitive) == 0)
                {
                        return true;
                }