///////////////////////////////////////////////////////////////////////////////
// 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
#include <QStringList>
#include <QMutex>
#include <QSemaphore>
+#include <QPair>
class AudioFileModel;
class QFile;
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 until there is a free slot in the queue
- static bool waitForFreeSlot(volatile bool *abortFlag);
+ enum fileType_t
+ {
+ fileTypeNormal = 0,
+ fileTypeCDDA = 1,
+ fileTypeDenied = 2,
+ fileTypeCueSheet = 3,
+ fileTypeUnknown = 4
+ };
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);
void run_ex(void);
private:
- enum cover_t
- {
- coverNone,
- coverJpeg,
- 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);
+ void updateInfo(AudioFileModel &audioFile, bool &skipNext, QPair<quint32, quint32> &id_val, quint32 &coverType, QByteArray &coverData, const QString &key, const QString &value);
unsigned int parseYear(const QString &str);
unsigned int parseDuration(const QString &str);
bool checkFile_CDDA(QFile &file);
- void retrieveCover(AudioFileModel &audioFile, cover_t coverType, const QByteArray &coverData);
+ void retrieveCover(AudioFileModel &audioFile, const quint32 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;
const QString m_inputFile;
volatile bool *m_abortFlag;
-
- static QMutex s_waitMutex;
- static QWaitCondition s_waitCond;
- static QSet<unsigned int> s_threadIdx_running;
- static unsigned int s_threadIdx_next;
-
- static QSemaphore s_semaphore;
-
- static QReadWriteLock s_lock;
- 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 QSet<QString> s_recentlyAdded;
- static QStringList s_additionalFiles;
-
- static unsigned __int64 makeThreadIdx(void);
};