Switch to using QAtomicInc for abort flags.

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

diff --git a/src/Decoder_WavPack.cpp b/src/Decoder_WavPack.cpp
index e6497b5..25639f7 100644 (file)
--- a/src/Decoder_WavPack.cpp
+++ b/src/Decoder_WavPack.cpp
@@ -1,11 +1,12 @@
 ///////////////////////////////////////////////////////////////////////////////
 // LameXP - Audio Encoder Front-End
-// Copyright (C) 2004-2011 LoRd_MuldeR <MuldeR2@GMX.de>
+// Copyright (C) 2004-2017 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
 // the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
+// (at your option) any later version, but always including the *additional*
+// restrictions defined in the "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_WavPack.h"
 
+//Internal
 #include "Global.h"
 
+//MUtils
+#include <MUtils/Exception.h>
+
+//Qt
 #include <QDir>
 #include <QProcess>
 #include <QRegExp>
 
 WavPackDecoder::WavPackDecoder(void)
 :
-       m_binary(lamexp_lookup_tool("wvunpack.exe"))
+       m_binary(lamexp_tools_lookup("wvunpack.exe"))
 {
        if(m_binary.isEmpty())
        {
-               throw "Error initializing WavPack decoder. Tool 'wvunpack.exe' is not registred!";
+               MUTILS_THROW("Error initializing WavPack decoder. Tool 'wvunpack.exe' is not registred!");
        }
 }
 
@@ -41,7 +47,7 @@ WavPackDecoder::~WavPackDecoder(void)
 {
 }
 
-bool WavPackDecoder::decode(const QString &sourceFile, const QString &outputFile, volatile bool *abortFlag)
+bool WavPackDecoder::decode(const QString &sourceFile, const QString &outputFile, QAtomicInt &abortFlag)
 {
        QProcess process;
        QStringList args;
@@ -57,12 +63,13 @@ bool WavPackDecoder::decode(const QString &sourceFile, const QString &outputFile
 
        bool bTimeout = false;
        bool bAborted = false;
+       int prevProgress = -1;
 
-       QRegExp regExp("\\s(\\d+)% done");
+       QRegExp regExp("(\\s|\b)(\\d+)%\\s+done");
 
        while(process.state() != QProcess::NotRunning)
        {
-               if(*abortFlag)
+               if(checkFlag(abortFlag))
                {
                        process.kill();
                        bAborted = true;
@@ -85,8 +92,12 @@ bool WavPackDecoder::decode(const QString &sourceFile, const QString &outputFile
                        if(regExp.lastIndexIn(text) >= 0)
                        {
                                bool ok = false;
-                               int progress = regExp.cap(1).toInt(&ok);
-                               if(ok) emit statusUpdated(progress);
+                               int progress = regExp.cap(2).toInt(&ok);
+                               if(ok && (progress > prevProgress))
+                               {
+                                       emit statusUpdated(progress);
+                                       prevProgress = qMin(progress + 2, 99);
+                               }
                        }
                        else if(!text.isEmpty())
                        {
@@ -105,7 +116,7 @@ bool WavPackDecoder::decode(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;
        }
@@ -126,7 +137,18 @@ bool WavPackDecoder::isFormatSupported(const QString &containerType, const QStri
        return false;
 }
 
-QStringList WavPackDecoder::supportedTypes(void)
+const AbstractDecoder::supportedType_t *WavPackDecoder::supportedTypes(void)
 {
-       return QStringList() << "WavPack Hybrid Lossless Audio (*.wv)";
+       static const char *exts[] =
+       {
+               "wv", NULL
+       };
+
+       static const supportedType_t s_supportedTypes[] =
+       {
+               { "WavPack Hybrid Lossless Audio", exts },
+               { NULL, NULL }
+       };
+
+       return s_supportedTypes;
 }