Bump version.

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

diff --git a/src/Decoder_MAC.cpp b/src/Decoder_MAC.cpp
index ede9294..bee7dd9 100644 (file)
--- a/src/Decoder_MAC.cpp
+++ b/src/Decoder_MAC.cpp
@@ -1,11 +1,12 @@
 ///////////////////////////////////////////////////////////////////////////////
 // LameXP - Audio Encoder Front-End
-// Copyright (C) 2004-2013 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,19 +22,24 @@
 
 #include "Decoder_MAC.h"
 
+//Internal
 #include "Global.h"
 
+//MUtils
+#include <MUtils/Exception.h>
+
+//Qt
 #include <QDir>
 #include <QProcess>
 #include <QRegExp>
 
 MACDecoder::MACDecoder(void)
 :
-       m_binary(lamexp_lookup_tool("mac.exe"))
+       m_binary(lamexp_tools_lookup("mac.exe"))
 {
        if(m_binary.isEmpty())
        {
-               THROW("Error initializing MAC decoder. Tool 'mac.exe' is not registred!");
+               MUTILS_THROW("Error initializing MAC decoder. Tool 'mac.exe' is not registred!");
        }
 }
 
@@ -41,7 +47,7 @@ MACDecoder::~MACDecoder(void)
 {
 }
 
-bool MACDecoder::decode(const QString &sourceFile, const QString &outputFile, volatile bool *abortFlag)
+bool MACDecoder::decode(const QString &sourceFile, const QString &outputFile, QAtomicInt &abortFlag)
 {
        QProcess process;
        QStringList args;
@@ -55,74 +61,36 @@ bool MACDecoder::decode(const QString &sourceFile, const QString &outputFile, vo
                return false;
        }
 
-       bool bTimeout = false;
-       bool bAborted = false;
        int prevProgress = -1;
-
        QRegExp regExp("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("\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("\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 || QFileInfo(outputFile).size() == 0)
-       {
                return false;
-       }
+       });
        
-       return true;
+       return (result == RESULT_SUCCESS);
 }
 
 bool MACDecoder::isFormatSupported(const QString &containerType, const QString &containerProfile, const QString &formatType, const QString &formatProfile, const QString &formatVersion)
 {
-       if(containerType.compare("Monkey's Audio", Qt::CaseInsensitive) == 0)
+       static const QLatin1String mac("Monkey's Audio");
+       if(containerType.compare(mac, Qt::CaseInsensitive) == 0)
        {
-               if(formatType.compare("Monkey's Audio", Qt::CaseInsensitive) == 0)
+               if(formatType.compare(mac, Qt::CaseInsensitive) == 0)
                {
                        return true;
                }
@@ -131,7 +99,18 @@ bool MACDecoder::isFormatSupported(const QString &containerType, const QString &
        return false;
 }
 
-QStringList MACDecoder::supportedTypes(void)
+const AbstractDecoder::supportedType_t *MACDecoder::supportedTypes(void)
 {
-       return QStringList() << "Monkey's Audio (*.ape)";
+       static const char *exts[] =
+       {
+               "ape", NULL
+       };
+
+       static const supportedType_t s_supportedTypes[] =
+       {
+               { "Monkey's Audio", exts },
+               { NULL, NULL }
+       };
+
+       return s_supportedTypes;
 }