Switch to using QAtomicInc for abort flags.

[lamexp/LameXP.git] / src / Thread_Process.h

diff --git a/src/Thread_Process.h b/src/Thread_Process.h
index 9609ab7..7a6dae6 100644 (file)
--- a/src/Thread_Process.h
+++ b/src/Thread_Process.h
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 // LameXP - Audio Encoder Front-End
-// Copyright (C) 2004-2016 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
@@ -54,7 +54,7 @@ public:
        void addFilter(AbstractFilter *filter);
 
 public slots:
-       void abort(void) { m_aborted = true; }
+       void abort(void) { m_aborted.ref(); }
 
 private slots:
        void handleUpdate(int progress);
@@ -90,14 +90,14 @@ private:
        void processFile();
        int generateOutFileName(QString &outFileName);
        QString applyRenamePattern(const QString &baseName, const AudioFileModel_MetaInfo &metaInfo);
-       QString applyRegularExpression(const QString &fileName);
+       QString applyRegularExpression(const QString &baseName);
        QString generateTempFileName(void);
-       void insertDownmixFilter(void);
-       void insertDownsampleFilter(void);
+       bool insertDownmixFilter(const unsigned int *const supportedChannels);
+       bool insertDownsampleFilter(const unsigned int *const supportedSamplerates, const unsigned int *const supportedBitdepths);
        bool updateFileTime(const QString &originalFile, const QString &modifiedFile);
 
-       volatile bool m_aborted;
-       volatile int m_initialized;
+       QAtomicInt m_aborted;
+       QAtomicInt m_initialized;
 
        const QUuid m_jobId;
        AudioFileModel m_audioFile;