Added missing source code files to Git repo.

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

diff --git a/src/Thread_FileAnalyzer_Task.h b/src/Thread_FileAnalyzer_Task.h
index 008e38b..3cc8678 100644 (file)
--- a/src/Thread_FileAnalyzer_Task.h
+++ b/src/Thread_FileAnalyzer_Task.h
@@ -1,11 +1,12 @@
 ///////////////////////////////////////////////////////////////////////////////
 // LameXP - Audio Encoder Front-End
-// Copyright (C) 2004-2012 LoRd_MuldeR <MuldeR2@GMX.de>
+// Copyright (C) 2004-2015 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
@@ -26,6 +27,7 @@
 #include <QWaitCondition>
 #include <QStringList>
 #include <QMutex>
+#include <QSemaphore>
 
 class AudioFileModel;
 class QFile;
@@ -42,32 +44,24 @@ class AnalyzeTask: public QObject, public QRunnable
        Q_OBJECT
 
 public:
-       AnalyzeTask(const QString &inputFile, const QString &templateFile, volatile bool *abortFlag);
+       AnalyzeTask(const int taskId, const QString &inputFile, const QString &templateFile, volatile bool *abortFlag);
        ~AnalyzeTask(void);
        
-       static void reset(void);
-       static int getAdditionalFiles(QStringList &fileList);
-       static unsigned int filesAccepted(void);
-       static unsigned int filesRejected(void);
-       static unsigned int filesDenied(void);
-       static unsigned int filesDummyCDDA(void);
-       static unsigned int filesCueSheet(void);
-
-       //Wait till the next running thread terminates
-       static __forceinline bool waitForOneThread(unsigned long timeout)
+       enum fileType_t
        {
-               bool ret = false;
-               s_waitMutex.lock();
-               ret = s_waitCond.wait(&s_waitMutex, timeout);
-               s_waitMutex.unlock();
-               return ret;
-       }
+               fileTypeNormal = 0,
+               fileTypeCDDA = 1,
+               fileTypeDenied = 2,
+               fileTypeCueSheet = 3,
+               fileTypeUnknown = 4
+       };
+
+       //Wait until there is a free slot in the queue
+       static bool waitForFreeSlot(volatile bool *abortFlag);
 
 signals:
-       void fileSelected(const QString &fileName);
-       void fileAnalyzed(const AudioFileModel &file);
-       void progressValChanged(unsigned int);
-       void progressMaxChanged(unsigned int);
+       void fileAnalyzed(const unsigned int taskId, const int fileType, const AudioFileModel &file);
+       void taskCompleted(const unsigned int taskId);
 
 protected:
        void run(void);
@@ -81,13 +75,6 @@ private:
                coverPng,
                coverGif
        };
-       enum fileType_t
-       {
-               fileTypeNormal = 0,
-               fileTypeCDDA = 1,
-               fileTypeDenied = 2,
-               fileTypeSkip = 3
-       };
 
        const AudioFileModel analyzeFile(const QString &filePath, int *type);
        void updateInfo(AudioFileModel &audioFile, bool *skipNext, unsigned int *id_val, cover_t *coverType, QByteArray *coverData, const QString &key, const QString &value);
@@ -96,9 +83,8 @@ private:
        bool checkFile_CDDA(QFile &file);
        void retrieveCover(AudioFileModel &audioFile, cover_t coverType, const QByteArray &coverData);
        bool analyzeAvisynthFile(const QString &filePath, AudioFileModel &info);
-       void waitForPreviousThreads(void);
 
-       const unsigned __int64 m_threadIdx;
+       const unsigned int m_taskId;
 
        const QString m_mediaInfoBin;
        const QString m_avs2wavBin;
@@ -106,22 +92,4 @@ private:
        const QString m_inputFile;
        
        volatile bool *m_abortFlag;
-
-       static QReadWriteLock s_lock;
-       static QMutex s_waitMutex;
-       static QWaitCondition s_waitCond;
-       
-       static unsigned __int64 s_threadIdx_created;
-       static unsigned __int64 s_threadIdx_finished;
-
-       static QStringList s_recentlyAdded;
-       static QStringList s_additionalFiles;
-       
-       static unsigned int s_filesAccepted;
-       static unsigned int s_filesRejected;
-       static unsigned int s_filesDenied;
-       static unsigned int s_filesDummyCDDA;
-       static unsigned int s_filesCueSheet;
-       
-       static unsigned __int64 makeThreadIdx(void);
 };