Bump version.

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

diff --git a/src/Encoder_MAC.cpp b/src/Encoder_MAC.cpp
index 9dd474b..fe1e9a5 100644 (file)
--- a/src/Encoder_MAC.cpp
+++ b/src/Encoder_MAC.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
@@ -136,7 +136,7 @@ MACEncoder::~MACEncoder(void)
 {
 }
 
-bool MACEncoder::encode(const QString &sourceFile, const AudioFileModel_MetaInfo &metaInfo, const unsigned int duration, const QString &outputFile, volatile bool *abortFlag)
+bool MACEncoder::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;
@@ -161,62 +161,28 @@ bool MACEncoder::encode(const QString &sourceFile, const AudioFileModel_MetaInfo
                return false;
        }
 
-       bool bTimeout = false;
-       bool bAborted = false;
        int prevProgress = -1;
-
        QRegExp regExp(L1S("Progress: (\\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(L1S("\nABORTED BY USER !!!"));
-                       break;
-               }
-               process.waitForReadyRead(m_processTimeoutInterval);
-               if(!process.bytesAvailable() && process.state() == QProcess::Running)
-               {
-                       process.kill();
-                       qWarning("MAC process timed out <-- killing!");
-                       emit messageLogged(L1S("\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()));
+               return false;
+       });
 
-       if(bTimeout || bAborted || process.exitCode() != EXIT_SUCCESS)
+       if(result != RESULT_SUCCESS)
        {
                return false;
        }
@@ -246,52 +212,7 @@ bool MACEncoder::encode(const QString &sourceFile, const AudioFileModel_MetaInfo
                return false;
        }
 
-       bTimeout = false;
-
-       while(process.state() != QProcess::NotRunning)
-       {
-               if(*abortFlag)
-               {
-                       process.kill();
-                       bAborted = true;
-                       emit messageLogged(L1S("\nABORTED BY USER !!!"));
-                       break;
-               }
-               process.waitForReadyRead(m_processTimeoutInterval);
-               if(!process.bytesAvailable() && process.state() == QProcess::Running)
-               {
-                       process.kill();
-                       qWarning("Tag process timed out <-- killing!");
-                       emit messageLogged(L1S("\nPROCESS TIMEOUT !!!"));
-                       bTimeout = true;
-                       break;
-               }
-               while(process.bytesAvailable() > 0)
-               {
-                       QByteArray line = process.readLine();
-                       QString text = QString::fromUtf8(line.constData()).simplified();
-                       if(!text.isEmpty())
-                       {
-                               emit messageLogged(text);
-                       }
-               }
-       }
-
-       process.waitForFinished();
-       if(process.state() != QProcess::NotRunning)
-       {
-               process.kill();
-               process.waitForFinished(-1);
-       }
-               
-       emit messageLogged(QString().sprintf("\nExited with code: 0x%04X", process.exitCode()));
-
-       if(bTimeout || bAborted || process.exitCode() != EXIT_SUCCESS)
-       {
-               return false;
-       }
-
-       return true;
+       return (awaitProcess(process, abortFlag) == RESULT_SUCCESS);
 }
 
 bool MACEncoder::isFormatSupported(const QString &containerType, const QString &containerProfile, const QString &formatType, const QString &formatProfile, const QString &formatVersion)