Refactored the Main() function into several sub-functions + some improvements of...

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

diff --git a/src/Dialog_Processing.h b/src/Dialog_Processing.h
index 43fad99..9a99bff 100644 (file)
--- a/src/Dialog_Processing.h
+++ b/src/Dialog_Processing.h
@@ -1,11 +1,12 @@
 ///////////////////////////////////////////////////////////////////////////////
 // LameXP - Audio Encoder Front-End
-// Copyright (C) 2004-2013 LoRd_MuldeR <MuldeR2@GMX.de>
+// Copyright (C) 2004-2014 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
@@ -39,15 +40,16 @@ class QLabel;
 class QMenu;
 class QModelIndex;
 class QMovie;
+class QThreadPool;
+class QElapsedTimer;
 class RAMObserverThread;
 class SettingsModel;
-class QThreadPool;
 
-enum shutdownFlag_t
+enum lamexp_shutdownFlag_t
 {
-       shutdownFlag_None = 0,
-       shutdownFlag_TurnPowerOff = 1,
-       shutdownFlag_Hibernate = 2
+       SHUTDOWN_FLAG_NONE = 0,
+       SHUTDOWN_FLAG_POWER_OFF = 1,
+       SHUTDOWN_FLAG_HIBERNATE = 2
 };
 
 //UIC forward declartion
@@ -68,6 +70,7 @@ public:
 
 private slots:
        void initEncoding(void);
+       void initNextJob(void);
        void startNextJob(void);
        void doneEncoding(void);
        void abortEncoding(bool force = false);
@@ -102,7 +105,7 @@ private:
        AudioFileModel updateMetaInfo(AudioFileModel &audioFile);
        void writePlayList(void);
        bool shutdownComputer(void);
-       QString time2text(const double timeVal) const;
+       QString time2text(const qint64 &msec) const;
        
        QThreadPool *m_threadPool;
        QList<AudioFileModel> m_pendingJobs;
@@ -115,6 +118,7 @@ private:
        QActionGroup *m_progressViewFilterGroup;
        QLabel *m_filterInfoLabel;
        QLabel *m_filterInfoLabelIcon;
+       unsigned int m_initThreads;
        unsigned int m_runningThreads;
        unsigned int m_currentFile;
        QList<QUuid> m_allJobs;
@@ -129,6 +133,7 @@ private:
        CPUObserverThread *m_cpuObserver;
        RAMObserverThread *m_ramObserver;
        DiskObserverThread *m_diskObserver;
-       qint64 m_timerStart;
+       QScopedPointer<QElapsedTimer> m_totalTime;
        int m_progressViewFilter;
+       QColor *m_defaultColor;
 };