OSDN Git Service

Extinguished some remaining uses of argv[] or QApplication::arguments().
[lamexp/LameXP.git] / src / Dialog_Processing.cpp
index 95ba8e6..d73b199 100644 (file)
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 // LameXP - Audio Encoder Front-End
-// Copyright (C) 2004-2011 LoRd_MuldeR <MuldeR2@GMX.de>
+// Copyright (C) 2004-2012 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
 #include "Model_Progress.h"
 #include "Model_Settings.h"
 #include "Thread_Process.h"
+#include "Thread_CPUObserver.h"
+#include "Thread_RAMObserver.h"
 #include "Thread_DiskObserver.h"
 #include "Dialog_LogView.h"
-#include "Encoder_MP3.h"
-#include "Encoder_Vorbis.h"
 #include "Encoder_AAC.h"
+#include "Encoder_AAC_FHG.h"
+#include "Encoder_AAC_QAAC.h"
 #include "Encoder_AC3.h"
+#include "Encoder_DCA.h"
 #include "Encoder_FLAC.h"
+#include "Encoder_MP3.h"
+#include "Encoder_Vorbis.h"
 #include "Encoder_Wave.h"
+#include "Filter_Downmix.h"
 #include "Filter_Normalize.h"
 #include "Filter_Resample.h"
 #include "Filter_ToneAdjust.h"
 #include <QSystemTrayIcon>
 #include <QProcess>
 #include <QProgressDialog>
+#include <QTime>
 
 #include <MMSystem.h>
+#include <math.h>
+#include <float.h>
 
 ////////////////////////////////////////////////////////////
 
 //Maximum number of parallel instances
-#define MAX_INSTANCES 16
+#define MAX_INSTANCES 16U
 
-//Maximum number of CPU cores for auto-detection
-#define MAX_CPU_COUNT 4
+//Function to calculate the number of instances
+static int cores2instances(int cores);
 
 ////////////////////////////////////////////////////////////
 
@@ -83,6 +92,7 @@
 }
 
 #define SET_FONT_BOLD(WIDGET,BOLD) { QFont _font = WIDGET->font(); _font.setBold(BOLD); WIDGET->setFont(_font); }
+#define UPDATE_MIN_WIDTH(WIDGET) { if(WIDGET->width() > WIDGET->minimumWidth()) WIDGET->setMinimumWidth(WIDGET->width()); }
 
 ////////////////////////////////////////////////////////////
 // Constructor
@@ -94,13 +104,19 @@ ProcessingDialog::ProcessingDialog(FileListModel *fileListModel, AudioFileModel
        m_systemTray(new QSystemTrayIcon(QIcon(":/icons/cd_go.png"), this)),
        m_settings(settings),
        m_metaInfo(metaInfo),
-       m_shutdownFlag(false),
-       m_diskObserver(NULL)
+       m_shutdownFlag(shutdownFlag_None),
+       m_diskObserver(NULL),
+       m_cpuObserver(NULL),
+       m_ramObserver(NULL),
+       m_firstShow(true)
 {
        //Init the dialog, from the .ui file
        setupUi(this);
        setWindowFlags(windowFlags() ^ Qt::WindowContextHelpButtonHint);
        
+       //Update header icon
+       label_headerIcon->setPixmap(lamexp_app_icon().pixmap(label_headerIcon->size()));
+       
        //Setup version info
        label_versionInfo->setText(QString().sprintf("v%d.%02d %s (Build %d)", lamexp_version_major(), lamexp_version_minor(), lamexp_version_release(), lamexp_version_build()));
        label_versionInfo->installEventFilter(this);
@@ -119,6 +135,8 @@ ProcessingDialog::ProcessingDialog(FileListModel *fileListModel, AudioFileModel
        
        //Init progress indicator
        m_progressIndicator = new QMovie(":/images/Working.gif");
+       m_progressIndicator->setCacheMode(QMovie::CacheAll);
+       m_progressIndicator->setSpeed(50);
        label_headerWorking->setMovie(m_progressIndicator);
        progressBar->setValue(0);
 
@@ -129,9 +147,11 @@ ProcessingDialog::ProcessingDialog(FileListModel *fileListModel, AudioFileModel
        view_log->verticalHeader()->hide();
        view_log->horizontalHeader()->setResizeMode(QHeaderView::ResizeToContents);
        view_log->horizontalHeader()->setResizeMode(0, QHeaderView::Stretch);
+       view_log->viewport()->installEventFilter(this);
        connect(m_progressModel, SIGNAL(rowsInserted(QModelIndex,int,int)), this, SLOT(progressModelChanged()));
        connect(m_progressModel, SIGNAL(modelReset()), this, SLOT(progressModelChanged()));
        connect(view_log, SIGNAL(activated(QModelIndex)), this, SLOT(logViewDoubleClicked(QModelIndex)));
+       connect(view_log->horizontalHeader(), SIGNAL(sectionResized(int,int,int)), this, SLOT(logViewSectionSizeChanged(int,int,int)));
 
        //Create context menu
        m_contextMenu = new QMenu();
@@ -166,6 +186,8 @@ ProcessingDialog::ProcessingDialog(FileListModel *fileListModel, AudioFileModel
        m_succeededJobs.clear();
        m_failedJobs.clear();
        m_userAborted = false;
+       m_forcedAbort = false;
+       m_timerStart = 0I64;
 }
 
 ////////////////////////////////////////////////////////////
@@ -184,7 +206,29 @@ ProcessingDialog::~ProcessingDialog(void)
        if(m_diskObserver)
        {
                m_diskObserver->stop();
-               m_diskObserver->wait(15000);
+               if(!m_diskObserver->wait(15000))
+               {
+                       m_diskObserver->terminate();
+                       m_diskObserver->wait();
+               }
+       }
+       if(m_cpuObserver)
+       {
+               m_cpuObserver->stop();
+               if(!m_cpuObserver->wait(15000))
+               {
+                       m_cpuObserver->terminate();
+                       m_cpuObserver->wait();
+               }
+       }
+       if(m_ramObserver)
+       {
+               m_ramObserver->stop();
+               if(!m_ramObserver->wait(15000))
+               {
+                       m_ramObserver->terminate();
+                       m_ramObserver->wait();
+               }
        }
 
        LAMEXP_DELETE(m_progressIndicator);
@@ -192,6 +236,8 @@ ProcessingDialog::~ProcessingDialog(void)
        LAMEXP_DELETE(m_contextMenu);
        LAMEXP_DELETE(m_systemTray);
        LAMEXP_DELETE(m_diskObserver);
+       LAMEXP_DELETE(m_cpuObserver);
+       LAMEXP_DELETE(m_ramObserver);
 
        WinSevenTaskbar::setOverlayIcon(this, NULL);
        WinSevenTaskbar::setTaskbarState(this, WinSevenTaskbar::WinSevenTaskbarNoState);
@@ -211,17 +257,29 @@ ProcessingDialog::~ProcessingDialog(void)
 
 void ProcessingDialog::showEvent(QShowEvent *event)
 {
-       setCloseButtonEnabled(false);
-       button_closeDialog->setEnabled(false);
-       button_AbortProcess->setEnabled(false);
-       m_systemTray->setVisible(true);
-       
-       if(!SetPriorityClass(GetCurrentProcess(), ABOVE_NORMAL_PRIORITY_CLASS))
+       QDialog::showEvent(event);
+
+       if(m_firstShow)
        {
-               SetPriorityClass(GetCurrentProcess(), HIGH_PRIORITY_CLASS);
-       }
+               static const char *NA = " N/A";
+       
+               setCloseButtonEnabled(false);
+               button_closeDialog->setEnabled(false);
+               button_AbortProcess->setEnabled(false);
+               m_systemTray->setVisible(true);
+       
+               if(!SetPriorityClass(GetCurrentProcess(), ABOVE_NORMAL_PRIORITY_CLASS))
+               {
+                       SetPriorityClass(GetCurrentProcess(), HIGH_PRIORITY_CLASS);
+               }
+
+               label_cpu->setText(NA);
+               label_disk->setText(NA);
+               label_ram->setText(NA);
 
-       QTimer::singleShot(1000, this, SLOT(initEncoding()));
+               QTimer::singleShot(1000, this, SLOT(initEncoding()));
+               m_firstShow = false;
+       }
 }
 
 void ProcessingDialog::closeEvent(QCloseEvent *event)
@@ -265,18 +323,51 @@ bool ProcessingDialog::eventFilter(QObject *obj, QEvent *event)
        return false;
 }
 
+bool ProcessingDialog::event(QEvent *e)
+{
+       switch(e->type())
+       {
+       case lamexp_event_queryendsession:
+               qWarning("System is shutting down, preparing to abort...");
+               if(!m_userAborted) abortEncoding(true);
+               return true;
+       case lamexp_event_endsession:
+               qWarning("System is shutting down, encoding will be aborted now...");
+               if(isVisible())
+               {
+                       while(!close())
+                       {
+                               if(!m_userAborted) abortEncoding(true);
+                               QApplication::processEvents(QEventLoop::WaitForMoreEvents & QEventLoop::ExcludeUserInputEvents);
+                       }
+               }
+               m_pendingJobs.clear();
+               return true;
+       default:
+               return QDialog::event(e);
+       }
+}
+
+bool ProcessingDialog::winEvent(MSG *message, long *result)
+{
+       return WinSevenTaskbar::handleWinEvent(message, result);
+}
+
 ////////////////////////////////////////////////////////////
 // SLOTS
 ////////////////////////////////////////////////////////////
 
 void ProcessingDialog::initEncoding(void)
 {
+       qDebug("Initializing encoding process...");
+       
        m_runningThreads = 0;
        m_currentFile = 0;
        m_allJobs.clear();
        m_succeededJobs.clear();
        m_failedJobs.clear();
        m_userAborted = false;
+       m_forcedAbort = false;
        m_playList.clear();
        
        CHANGE_BACKGROUND_COLOR(frame_header, QColor(Qt::white));
@@ -289,7 +380,6 @@ void ProcessingDialog::initEncoding(void)
        checkBox_shutdownComputer->setEnabled(true);
        checkBox_shutdownComputer->setChecked(false);
 
-       WinSevenTaskbar::initTaskbar();
        WinSevenTaskbar::setTaskbarState(this, WinSevenTaskbar::WinSevenTaskbarNormalState);
        WinSevenTaskbar::setTaskbarProgress(this, 0, m_pendingJobs.count());
        WinSevenTaskbar::setOverlayIcon(this, &QIcon(":/icons/control_play_blue.png"));
@@ -297,34 +387,53 @@ void ProcessingDialog::initEncoding(void)
        if(!m_diskObserver)
        {
                m_diskObserver = new DiskObserverThread(m_settings->customTempPathEnabled() ? m_settings->customTempPath() : lamexp_temp_folder2());
-               connect(m_diskObserver, SIGNAL(messageLogged(QString,bool)), m_progressModel, SLOT(addSystemMessage(QString,bool)), Qt::QueuedConnection);
+               connect(m_diskObserver, SIGNAL(messageLogged(QString,int)), m_progressModel, SLOT(addSystemMessage(QString,int)), Qt::QueuedConnection);
+               connect(m_diskObserver, SIGNAL(freeSpaceChanged(quint64)), this, SLOT(diskUsageHasChanged(quint64)), Qt::QueuedConnection);
                m_diskObserver->start();
        }
+       if(!m_cpuObserver)
+       {
+               m_cpuObserver = new CPUObserverThread();
+               connect(m_cpuObserver, SIGNAL(currentUsageChanged(double)), this, SLOT(cpuUsageHasChanged(double)), Qt::QueuedConnection);
+               m_cpuObserver->start();
+       }
+       if(!m_ramObserver)
+       {
+               m_ramObserver = new RAMObserverThread();
+               connect(m_ramObserver, SIGNAL(currentUsageChanged(double)), this, SLOT(ramUsageHasChanged(double)), Qt::QueuedConnection);
+               m_ramObserver->start();
+       }
        
-       int maximumInstances = max(min(m_settings->maximumInstances(), MAX_INSTANCES), 0);
+       unsigned int maximumInstances = qBound(0U, m_settings->maximumInstances(), MAX_INSTANCES);
        if(maximumInstances < 1)
        {
-               lamexp_cpu_t cpuFeatures = lamexp_detect_cpu_features();
-               maximumInstances = max(min(cpuFeatures.count, MAX_CPU_COUNT), 1);
+               lamexp_cpu_t cpuFeatures = lamexp_detect_cpu_features(lamexp_arguments());
+               maximumInstances = cores2instances(qBound(1, cpuFeatures.count, 64));
        }
 
-       int parallelThreadCount = max(min(maximumInstances, m_pendingJobs.count()), 1);
-       if(parallelThreadCount > 1)
+       maximumInstances = qBound(1U, maximumInstances, static_cast<unsigned int>(m_pendingJobs.count()));
+       if(maximumInstances > 1)
        {
-               m_progressModel->addSystemMessage(tr("Multi-threading enabled: Running %1 instances in parallel!").arg(QString::number(parallelThreadCount)));
+               m_progressModel->addSystemMessage(tr("Multi-threading enabled: Running %1 instances in parallel!").arg(QString::number(maximumInstances)));
        }
 
-       for(int i = 0; i < parallelThreadCount; i++)
+       for(unsigned int i = 0; i < maximumInstances; i++)
        {
                startNextJob();
        }
+
+       LARGE_INTEGER counter;
+       if(QueryPerformanceCounter(&counter))
+       {
+               m_timerStart = counter.QuadPart;
+       }
 }
 
-void ProcessingDialog::abortEncoding(void)
+void ProcessingDialog::abortEncoding(bool force)
 {
        m_userAborted = true;
+       if(force) m_forcedAbort = true;
        button_AbortProcess->setEnabled(false);
-       
        SET_PROGRESS_TEXT(tr("Aborted! Waiting for running jobs to terminate..."));
 
        for(int i = 0; i < m_threadList.count(); i++)
@@ -382,10 +491,23 @@ void ProcessingDialog::doneEncoding(void)
                m_systemTray->showMessage(tr("LameXP - Aborted"), tr("Process was aborted by the user."), QSystemTrayIcon::Warning);
                m_systemTray->setIcon(QIcon(":/icons/cd_delete.png"));
                QApplication::processEvents();
-               if(m_settings->soundsEnabled()) PlaySound(MAKEINTRESOURCE(IDR_WAVE_ABORTED), GetModuleHandle(NULL), SND_RESOURCE | SND_SYNC);
+               if(m_settings->soundsEnabled() && !m_forcedAbort)
+               {
+                       PlaySound(MAKEINTRESOURCE(IDR_WAVE_ABORTED), GetModuleHandle(NULL), SND_RESOURCE | SND_SYNC);
+               }
        }
        else
        {
+               LARGE_INTEGER counter, frequency;
+               if(QueryPerformanceCounter(&counter) && QueryPerformanceFrequency(&frequency))
+               {
+                       if((m_timerStart > 0I64) && (frequency.QuadPart > 0I64) && (m_timerStart < counter.QuadPart))
+                       {
+                               double timeElapsed = static_cast<double>(counter.QuadPart - m_timerStart) / static_cast<double>(frequency.QuadPart);
+                               m_progressModel->addSystemMessage(tr("Process finished after %1.").arg(time2text(timeElapsed)), ProgressModel::SysMsg_Performance);
+                       }
+               }
+
                if(m_failedJobs.count() > 0)
                {
                        CHANGE_BACKGROUND_COLOR(frame_header, QColor("#FFBABA"));
@@ -415,6 +537,7 @@ void ProcessingDialog::doneEncoding(void)
        button_AbortProcess->setEnabled(false);
        checkBox_shutdownComputer->setEnabled(false);
 
+       m_progressModel->restoreHiddenItems();
        view_log->scrollToBottom();
        m_progressIndicator->stop();
        progressBar->setValue(progressBar->maximum());
@@ -426,7 +549,7 @@ void ProcessingDialog::doneEncoding(void)
        {
                if(shutdownComputer())
                {
-                       m_shutdownFlag = true;
+                       m_shutdownFlag = m_settings->hibernateComputer() ? shutdownFlag_Hibernate : shutdownFlag_TurnPowerOff;
                        accept();
                }
        }
@@ -465,7 +588,7 @@ void ProcessingDialog::logViewDoubleClicked(const QModelIndex &index)
                }
                else
                {
-                       MessageBeep(MB_ICONWARNING);
+                       QMessageBox::information(this, windowTitle(), m_progressModel->data(m_progressModel->index(index.row(), 0)).toString());
                }
        }
        else
@@ -474,6 +597,17 @@ void ProcessingDialog::logViewDoubleClicked(const QModelIndex &index)
        }
 }
 
+void ProcessingDialog::logViewSectionSizeChanged(int logicalIndex, int oldSize, int newSize)
+{
+       if(logicalIndex == 1)
+       {
+               if(QHeaderView *hdr = view_log->horizontalHeader())
+               {
+                       hdr->setMinimumSectionSize(qMax(hdr->minimumSectionSize(), hdr->sectionSize(1)));
+               }
+       }
+}
+
 void ProcessingDialog::contextMenuTriggered(const QPoint &pos)
 {
        QAbstractScrollArea *scrollArea = dynamic_cast<QAbstractScrollArea*>(QObject::sender());
@@ -487,13 +621,13 @@ void ProcessingDialog::contextMenuTriggered(const QPoint &pos)
 
 void ProcessingDialog::contextMenuDetailsActionTriggered(void)
 {
-       QModelIndex index = view_log->indexAt(view_log->mapFromGlobal(m_contextMenu->pos()));
+       QModelIndex index = view_log->indexAt(view_log->viewport()->mapFromGlobal(m_contextMenu->pos()));
        logViewDoubleClicked(index.isValid() ? index : view_log->currentIndex());
 }
 
 void ProcessingDialog::contextMenuShowFileActionTriggered(void)
 {
-       QModelIndex index = view_log->indexAt(view_log->mapFromGlobal(m_contextMenu->pos()));
+       QModelIndex index = view_log->indexAt(view_log->viewport()->mapFromGlobal(m_contextMenu->pos()));
        const QUuid &jobId = m_progressModel->getJobId(index.isValid() ? index : view_log->currentIndex());
        QString filePath = m_playList.value(jobId, QString());
 
@@ -547,9 +681,66 @@ void ProcessingDialog::startNextJob(void)
        
        m_currentFile++;
        AudioFileModel currentFile = updateMetaInfo(m_pendingJobs.takeFirst());
-       AbstractEncoder *encoder = NULL;
        bool nativeResampling = false;
 
+       //Create encoder instance
+       AbstractEncoder *encoder = makeEncoder(&nativeResampling);
+
+       //Create processing thread
+       ProcessThread *thread = new ProcessThread
+       (
+               currentFile,
+               (m_settings->outputToSourceDir() ? QFileInfo(currentFile.filePath()).absolutePath() : m_settings->outputDir()),
+               (m_settings->customTempPathEnabled() ? m_settings->customTempPath() : lamexp_temp_folder2()),
+               encoder,
+               m_settings->prependRelativeSourcePath() && (!m_settings->outputToSourceDir())
+       );
+
+       //Add audio filters
+       if(m_settings->forceStereoDownmix())
+       {
+               thread->addFilter(new DownmixFilter());
+       }
+       if((m_settings->samplingRate() > 0) && !nativeResampling)
+       {
+               if(SettingsModel::samplingRates[m_settings->samplingRate()] != currentFile.formatAudioSamplerate() || currentFile.formatAudioSamplerate() == 0)
+               {
+                       thread->addFilter(new ResampleFilter(SettingsModel::samplingRates[m_settings->samplingRate()]));
+               }
+       }
+       if((m_settings->toneAdjustBass() != 0) || (m_settings->toneAdjustTreble() != 0))
+       {
+               thread->addFilter(new ToneAdjustFilter(m_settings->toneAdjustBass(), m_settings->toneAdjustTreble()));
+       }
+       if(m_settings->normalizationFilterEnabled())
+       {
+               thread->addFilter(new NormalizeFilter(m_settings->normalizationFilterMaxVolume(), m_settings->normalizationFilterEqualizationMode()));
+       }
+       if(m_settings->renameOutputFilesEnabled() && (!m_settings->renameOutputFilesPattern().simplified().isEmpty()))
+       {
+               thread->setRenamePattern(m_settings->renameOutputFilesPattern());
+       }
+
+       m_threadList.append(thread);
+       m_allJobs.append(thread->getId());
+       
+       //Connect thread signals
+       connect(thread, SIGNAL(finished()), this, SLOT(doneEncoding()), Qt::QueuedConnection);
+       connect(thread, SIGNAL(processStateInitialized(QUuid,QString,QString,int)), m_progressModel, SLOT(addJob(QUuid,QString,QString,int)), Qt::QueuedConnection);
+       connect(thread, SIGNAL(processStateChanged(QUuid,QString,int)), m_progressModel, SLOT(updateJob(QUuid,QString,int)), Qt::QueuedConnection);
+       connect(thread, SIGNAL(processStateFinished(QUuid,QString,bool)), this, SLOT(processFinished(QUuid,QString,bool)), Qt::QueuedConnection);
+       connect(thread, SIGNAL(processMessageLogged(QUuid,QString)), m_progressModel, SLOT(appendToLog(QUuid,QString)), Qt::QueuedConnection);
+       
+       //Give it a go!
+       m_runningThreads++;
+       thread->start();
+}
+
+AbstractEncoder *ProcessingDialog::makeEncoder(bool *nativeResampling)
+{
+       AbstractEncoder *encoder =  NULL;
+       *nativeResampling = false;
+       
        switch(m_settings->compressionEncoder())
        {
        case SettingsModel::MP3Encoder:
@@ -565,7 +756,7 @@ void ProcessingDialog::startNextJob(void)
                        if(m_settings->samplingRate() > 0)
                        {
                                mp3Encoder->setSamplingRate(SettingsModel::samplingRates[m_settings->samplingRate()]);
-                               nativeResampling = true;
+                               *nativeResampling = true;
                        }
                        mp3Encoder->setChannelMode(m_settings->lameChannelMode());
                        mp3Encoder->setCustomParams(m_settings->customParametersLAME());
@@ -584,7 +775,7 @@ void ProcessingDialog::startNextJob(void)
                        if(m_settings->samplingRate() > 0)
                        {
                                vorbisEncoder->setSamplingRate(SettingsModel::samplingRates[m_settings->samplingRate()]);
-                               nativeResampling = true;
+                               *nativeResampling = true;
                        }
                        vorbisEncoder->setCustomParams(m_settings->customParametersOggEnc());
                        encoder = vorbisEncoder;
@@ -592,13 +783,34 @@ void ProcessingDialog::startNextJob(void)
                break;
        case SettingsModel::AACEncoder:
                {
-                       AACEncoder *aacEncoder = new AACEncoder();
-                       aacEncoder->setBitrate(m_settings->compressionBitrate());
-                       aacEncoder->setRCMode(m_settings->compressionRCMode());
-                       aacEncoder->setEnable2Pass(m_settings->neroAACEnable2Pass());
-                       aacEncoder->setProfile(m_settings->neroAACProfile());
-                       aacEncoder->setCustomParams(m_settings->customParametersNeroAAC());
-                       encoder = aacEncoder;
+                       if(lamexp_check_tool("qaac.exe") && lamexp_check_tool("libsoxrate.dll"))
+                       {
+                               QAACEncoder *aacEncoder = new QAACEncoder();
+                               aacEncoder->setBitrate(m_settings->compressionBitrate());
+                               aacEncoder->setRCMode(m_settings->compressionRCMode());
+                               aacEncoder->setProfile(m_settings->aacEncProfile());
+                               aacEncoder->setCustomParams(m_settings->customParametersAacEnc());
+                               encoder = aacEncoder;
+                       }
+                       else if(lamexp_check_tool("fhgaacenc.exe") && lamexp_check_tool("enc_fhgaac.dll"))
+                       {
+                               FHGAACEncoder *aacEncoder = new FHGAACEncoder();
+                               aacEncoder->setBitrate(m_settings->compressionBitrate());
+                               aacEncoder->setRCMode(m_settings->compressionRCMode());
+                               aacEncoder->setProfile(m_settings->aacEncProfile());
+                               aacEncoder->setCustomParams(m_settings->customParametersAacEnc());
+                               encoder = aacEncoder;
+                       }
+                       else
+                       {
+                               AACEncoder *aacEncoder = new AACEncoder();
+                               aacEncoder->setBitrate(m_settings->compressionBitrate());
+                               aacEncoder->setRCMode(m_settings->compressionRCMode());
+                               aacEncoder->setEnable2Pass(m_settings->neroAACEnable2Pass());
+                               aacEncoder->setProfile(m_settings->aacEncProfile());
+                               aacEncoder->setCustomParams(m_settings->customParametersAacEnc());
+                               encoder = aacEncoder;
+                       }
                }
                break;
        case SettingsModel::AC3Encoder:
@@ -606,7 +818,11 @@ void ProcessingDialog::startNextJob(void)
                        AC3Encoder *ac3Encoder = new AC3Encoder();
                        ac3Encoder->setBitrate(m_settings->compressionBitrate());
                        ac3Encoder->setRCMode(m_settings->compressionRCMode());
-                       ac3Encoder->setCustomParams(m_settings->customParametersNeroAAC());
+                       ac3Encoder->setCustomParams(m_settings->customParametersAften());
+                       ac3Encoder->setAudioCodingMode(m_settings->aftenAudioCodingMode());
+                       ac3Encoder->setDynamicRangeCompression(m_settings->aftenDynamicRangeCompression());
+                       ac3Encoder->setExponentSearchSize(m_settings->aftenExponentSearchSize());
+                       ac3Encoder->setFastBitAllocation(m_settings->aftenFastBitAllocation());
                        encoder = ac3Encoder;
                }
                break;
@@ -619,6 +835,14 @@ void ProcessingDialog::startNextJob(void)
                        encoder = flacEncoder;
                }
                break;
+       case SettingsModel::DCAEncoder:
+               {
+                       DCAEncoder *dcaEncoder = new DCAEncoder();
+                       dcaEncoder->setBitrate(m_settings->compressionBitrate());
+                       dcaEncoder->setRCMode(m_settings->compressionRCMode());
+                       encoder = dcaEncoder;
+               }
+               break;
        case SettingsModel::PCMEncoder:
                {
                        WaveEncoder *waveEncoder = new WaveEncoder();
@@ -631,42 +855,7 @@ void ProcessingDialog::startNextJob(void)
                throw "Unsupported encoder!";
        }
 
-       ProcessThread *thread = new ProcessThread
-       (
-               currentFile,
-               (m_settings->outputToSourceDir() ? QFileInfo(currentFile.filePath()).absolutePath() : m_settings->outputDir()),
-               (m_settings->customTempPathEnabled() ? m_settings->customTempPath() : lamexp_temp_folder2()),
-               encoder,
-               m_settings->prependRelativeSourcePath()
-       );
-
-       if((m_settings->samplingRate() > 0) && !nativeResampling)
-       {
-               if(SettingsModel::samplingRates[m_settings->samplingRate()] != currentFile.formatAudioSamplerate() || currentFile.formatAudioSamplerate() == 0)
-               {
-                       thread->addFilter(new ResampleFilter(SettingsModel::samplingRates[m_settings->samplingRate()]));
-               }
-       }
-       if((m_settings->toneAdjustBass() != 0) || (m_settings->toneAdjustTreble() != 0))
-       {
-               thread->addFilter(new ToneAdjustFilter(m_settings->toneAdjustBass(), m_settings->toneAdjustTreble()));
-       }
-       if(m_settings->normalizationFilterEnabled())
-       {
-               thread->addFilter(new NormalizeFilter(m_settings->normalizationFilterMaxVolume()));
-       }
-
-       m_threadList.append(thread);
-       m_allJobs.append(thread->getId());
-       
-       connect(thread, SIGNAL(finished()), this, SLOT(doneEncoding()), Qt::QueuedConnection);
-       connect(thread, SIGNAL(processStateInitialized(QUuid,QString,QString,int)), m_progressModel, SLOT(addJob(QUuid,QString,QString,int)), Qt::QueuedConnection);
-       connect(thread, SIGNAL(processStateChanged(QUuid,QString,int)), m_progressModel, SLOT(updateJob(QUuid,QString,int)), Qt::QueuedConnection);
-       connect(thread, SIGNAL(processStateFinished(QUuid,QString,bool)), this, SLOT(processFinished(QUuid,QString,bool)), Qt::QueuedConnection);
-       connect(thread, SIGNAL(processMessageLogged(QUuid,QString)), m_progressModel, SLOT(appendToLog(QUuid,QString)), Qt::QueuedConnection);
-       
-       m_runningThreads++;
-       thread->start();
+       return encoder;
 }
 
 void ProcessingDialog::writePlayList(void)
@@ -677,32 +866,73 @@ void ProcessingDialog::writePlayList(void)
                return;
        }
        
+       //Init local variables
+       QStringList list;
+       QRegExp regExp1("\\[\\d\\d\\][^/\\\\]+$", Qt::CaseInsensitive);
+       QRegExp regExp2("\\(\\d\\d\\)[^/\\\\]+$", Qt::CaseInsensitive);
+       QRegExp regExp3("\\d\\d[^/\\\\]+$", Qt::CaseInsensitive);
+       bool usePrefix[3] = {true, true, true};
+       bool useUtf8 = false;
+       int counter = 1;
+
+       //Generate playlist name
        QString playListName = (m_metaInfo->fileAlbum().isEmpty() ? "Playlist" : m_metaInfo->fileAlbum());
+       if(!m_metaInfo->fileArtist().isEmpty())
+       {
+               playListName = QString("%1 - %2").arg(m_metaInfo->fileArtist(), playListName);
+       }
+
+       //Clean playlist name
+       playListName = lamexp_clean_filename(playListName);
 
-       const static char *invalidChars = "\\/:*?\"<>|";
-       for(int i = 0; invalidChars[i]; i++)
+       //Create list of audio files
+       for(int i = 0; i < m_allJobs.count(); i++)
        {
-               playListName.replace(invalidChars[i], ' ');
-               playListName = playListName.simplified();
+               if(!m_succeededJobs.contains(m_allJobs.at(i))) continue;
+               list << QDir::toNativeSeparators(QDir(m_settings->outputDir()).relativeFilePath(m_playList.value(m_allJobs.at(i), "N/A")));
        }
-       
-       QString playListFile = QString("%1/%2.m3u").arg(m_settings->outputDir(), playListName);
 
-       int counter = 1;
+       //Use prefix?
+       for(int i = 0; i < list.count(); i++)
+       {
+               if(regExp1.indexIn(list.at(i)) < 0) usePrefix[0] = false;
+               if(regExp2.indexIn(list.at(i)) < 0) usePrefix[1] = false;
+               if(regExp3.indexIn(list.at(i)) < 0) usePrefix[2] = false;
+       }
+       if(usePrefix[0] || usePrefix[1] || usePrefix[2])
+       {
+               playListName.prepend(usePrefix[0] ? "[00] " : (usePrefix[1] ? "(00) " : "00 "));
+       }
+
+       //Do we need an UTF-8 playlist?
+       for(int i = 0; i < list.count(); i++)
+       {
+               if(wcscmp(QWCHAR(QString::fromLatin1(list.at(i).toLatin1().constData())), QWCHAR(list.at(i))))
+               {
+                       useUtf8 = true;
+                       break;
+               }
+       }
+
+       //Generate playlist output file
+       QString playListFile = QString("%1/%2.%3").arg(m_settings->outputDir(), playListName, (useUtf8 ? "m3u8" : "m3u"));
        while(QFileInfo(playListFile).exists())
        {
-               playListFile = QString("%1/%2 (%3).m3u").arg(m_settings->outputDir(), playListName, QString::number(++counter));
+               playListFile = QString("%1/%2 (%3).%4").arg(m_settings->outputDir(), playListName, QString::number(++counter), (useUtf8 ? "m3u8" : "m3u"));
        }
 
+       //Now write playlist to output file
        QFile playList(playListFile);
        if(playList.open(QIODevice::WriteOnly))
        {
+               if(useUtf8)
+               {
+                       playList.write("\xef\xbb\xbf");
+               }
                playList.write("#EXTM3U\r\n");
-               for(int i = 0; i < m_allJobs.count(); i++)
+               while(!list.isEmpty())
                {
-                       
-                       if(!m_succeededJobs.contains(m_allJobs.at(i))) continue;
-                       playList.write(QDir::toNativeSeparators(QDir(m_settings->outputDir()).relativeFilePath(m_playList.value(m_allJobs.at(i), "N/A"))).toUtf8().constData());
+                       playList.write(useUtf8 ? list.takeFirst().toUtf8().constData() : list.takeFirst().toLatin1().constData());
                        playList.write("\r\n");
                }
                playList.close();
@@ -741,13 +971,43 @@ void ProcessingDialog::systemTrayActivated(QSystemTrayIcon::ActivationReason rea
 {
        if(reason == QSystemTrayIcon::DoubleClick)
        {
-               SetForegroundWindow(this->winId());
+               SetForegroundWindow(reinterpret_cast<HWND>(this->winId()));
+       }
+}
+
+void ProcessingDialog::cpuUsageHasChanged(const double val)
+{
+       
+       this->label_cpu->setText(QString().sprintf(" %d%%", qRound(val * 100.0)));
+       UPDATE_MIN_WIDTH(label_cpu);
+}
+
+void ProcessingDialog::ramUsageHasChanged(const double val)
+{
+       
+       this->label_ram->setText(QString().sprintf(" %d%%", qRound(val * 100.0)));
+       UPDATE_MIN_WIDTH(label_ram);
+}
+
+void ProcessingDialog::diskUsageHasChanged(const quint64 val)
+{
+       int postfix = 0;
+       const char *postfixStr[6] = {"B", "KB", "MB", "GB", "TB", "PB"};
+       double space = static_cast<double>(val);
+
+       while((space >= 1000.0) && (postfix < 5))
+       {
+               space = space / 1024.0;
+               postfix++;
        }
+
+       this->label_disk->setText(QString().sprintf(" %3.1f %s", space, postfixStr[postfix]));
+       UPDATE_MIN_WIDTH(label_disk);
 }
 
 bool ProcessingDialog::shutdownComputer(void)
 {
-       const int iTimeout = 30;
+       const int iTimeout = m_settings->hibernateComputer() ? 10 : 30;
        const Qt::WindowFlags flags = Qt::WindowStaysOnTopHint | Qt::CustomizeWindowHint | Qt::WindowTitleHint | Qt::MSWindowsFixedSizeDialogHint | Qt::WindowSystemMenuHint;
        const QString text = QString("%1%2%1").arg(QString().fill(' ', 18), tr("Warning: Computer will shutdown in %1 seconds..."));
        
@@ -798,3 +1058,64 @@ bool ProcessingDialog::shutdownComputer(void)
        progressDialog.close();
        return true;
 }
+
+QString ProcessingDialog::time2text(const double timeVal) const
+{
+       double intPart = 0;
+       double frcPart = modf(timeVal, &intPart);
+       int x = 0, y = 0; QString a, b;
+
+       QTime time = QTime().addSecs(qRound(intPart)).addMSecs(qRound(frcPart * 1000.0));
+
+       if(time.hour() > 0)
+       {
+               x = time.hour();   a = tr("hour(s)");
+               y = time.minute(); b = tr("minute(s)");
+       }
+       else if(time.minute() > 0)
+       {
+               x = time.minute(); a = tr("minute(s)");
+               y = time.second(); b = tr("second(s)");
+       }
+       else
+       {
+               x = time.second(); a = tr("second(s)");
+               y = time.msec();   b = tr("millisecond(s)");
+       }
+
+       return QString("%1 %2, %3 %4").arg(QString::number(x), a, QString::number(y), b);
+}
+
+////////////////////////////////////////////////////////////
+// HELPER FUNCTIONS
+////////////////////////////////////////////////////////////
+
+static int cores2instances(int cores)
+{
+       //This function is a "cubic spline" with sampling points at:
+       //(1,1); (2,2); (4,4); (8,6); (16,8); (32,11); (64,16)
+       static const double LUT[8][5] =
+       {
+               { 1.0,  0.014353554, -0.043060662, 1.028707108,  0.000000000},
+               { 2.0, -0.028707108,  0.215303309, 0.511979167,  0.344485294},
+               { 4.0,  0.010016468, -0.249379596, 2.370710784, -2.133823529},
+               { 8.0,  0.000282437, -0.015762868, 0.501776961,  2.850000000},
+               {16.0,  0.000033270, -0.003802849, 0.310416667,  3.870588235},
+               {32.0,  0.000006343, -0.001217831, 0.227696078,  4.752941176},
+               {64.0,  0.000000000,  0.000000000, 0.000000000, 16.000000000},
+               {DBL_MAX, 0.0, 0.0, 0.0, 0.0}
+       };
+
+       double x = abs(static_cast<double>(cores)), y = 1.0;
+       
+       for(size_t i = 0; i < 7; i++)
+       {
+               if((x >= LUT[i][0]) && (x < LUT[i+1][0]))
+               {
+                       y = (((((LUT[i][1] * x) + LUT[i][2]) * x) + LUT[i][3]) * x) + LUT[i][4];
+                       break;
+               }
+       }
+
+       return qRound(y);
+}