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 f96372b..25639f7 100644 (file)
--- a/src/Decoder_WavPack.cpp
+++ b/src/Decoder_WavPack.cpp
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 // LameXP - Audio Encoder Front-End
-// Copyright (C) 2004-2014 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
@@ -35,7 +35,7 @@
 
 WavPackDecoder::WavPackDecoder(void)
 :
-       m_binary(lamexp_lookup_tool("wvunpack.exe"))
+       m_binary(lamexp_tools_lookup("wvunpack.exe"))
 {
        if(m_binary.isEmpty())
        {
@@ -47,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;
@@ -69,7 +69,7 @@ bool WavPackDecoder::decode(const QString &sourceFile, const QString &outputFile
 
        while(process.state() != QProcess::NotRunning)
        {
-               if(*abortFlag)
+               if(checkFlag(abortFlag))
                {
                        process.kill();
                        bAborted = true;
@@ -137,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;
 }