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 90c974e..7a6dae6 100644 (file)
--- a/src/Thread_Process.h
+++ b/src/Thread_Process.h
@@ -1,11 +1,12 @@
 ///////////////////////////////////////////////////////////////////////////////
 // LameXP - Audio Encoder Front-End
-// Copyright (C) 2004-2013 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
@@ -42,15 +43,18 @@ public:
        ~ProcessThread(void);
        
        bool init(void);
-       bool start(QThreadPool *pool);
+       bool start(QThreadPool *const pool);
        
        QUuid getId(void) { return m_jobId; }
        void setRenamePattern(const QString &pattern);
-       void setOverwriteMode(const bool bSkipExistingFile, const bool ReplacesExisting = false);
+       void setRenameRegExp(const QString &search, const QString &replace);
+       void setRenameFileExt(const QString &fileExtension);
+       void setOverwriteMode(const bool &bSkipExistingFile, const bool &bReplacesExisting = false);
+       void setKeepDateTime(const bool &keepDateTime);
        void addFilter(AbstractFilter *filter);
 
 public slots:
-       void abort(void) { m_aborted = true; }
+       void abort(void) { m_aborted.ref(); }
 
 private slots:
        void handleUpdate(int progress);
@@ -75,15 +79,25 @@ private:
                EncodingStep = 3,
                UnknownStep = 4
        };
+
+       enum OverwriteMode
+       {
+               OverwriteMode_KeepBoth     = 0,
+               OverwriteMode_SkipExisting = 1,
+               OverwriteMode_Overwrite    = 2,
+       };
        
        void processFile();
        int generateOutFileName(QString &outFileName);
+       QString applyRenamePattern(const QString &baseName, const AudioFileModel_MetaInfo &metaInfo);
+       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;
@@ -95,8 +109,11 @@ private:
        const bool m_prependRelativeSourcePath;
        QList<AbstractFilter*> m_filters;
        QString m_renamePattern;
-       bool m_overwriteSkipExistingFile;
-       bool m_overwriteReplacesExisting;
+       QString m_renameRegExp_Search;
+       QString m_renameRegExp_Replace;
+       QString m_renameFileExt;
+       int m_overwriteMode;
+       bool m_keepDateTime;
        WaveProperties *m_propDetect;
        QString m_outFileName;
 };