OSDN Git Service

Merge branch 'master' of github.com:lordmulder/LameXP
[lamexp/LameXP.git] / src / Dialog_Processing.cpp
index e3ec0da..eaf03bb 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 "Dialog_Processing.h"
 
+//UIC includes
+#include "../tmp/UIC_ProcessingDialog.h"
+
 #include "Global.h"
 #include "Resource.h"
 #include "Model_FileList.h"
 #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_Opus.h"
 #include "Encoder_Wave.h"
+#include "Registry_Decoder.h"
+#include "Filter_Downmix.h"
 #include "Filter_Normalize.h"
 #include "Filter_Resample.h"
 #include "Filter_ToneAdjust.h"
 #include <QSystemTrayIcon>
 #include <QProcess>
 #include <QProgressDialog>
+#include <QResizeEvent>
+#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);
 
 ////////////////////////////////////////////////////////////
 
-#define CHANGE_BACKGROUND_COLOR(WIDGET, COLOR) \
+#define CHANGE_BACKGROUND_COLOR(WIDGET, COLOR) do \
 { \
        QPalette palette = WIDGET->palette(); \
        palette.setColor(QPalette::Background, COLOR); \
        WIDGET->setPalette(palette); \
-}
+} \
+while(0)
 
-#define SET_PROGRESS_TEXT(TXT) \
+#define SET_PROGRESS_TEXT(TXT) do \
 { \
-       label_progress->setText(TXT); \
+       ui->label_progress->setText(TXT); \
        m_systemTray->setToolTip(QString().sprintf("LameXP v%d.%02d\n%ls", lamexp_version_major(), lamexp_version_minor(), QString(TXT).utf16())); \
-}
+} \
+while(0)
+
+#define SET_FONT_BOLD(WIDGET,BOLD) do \
+{ \
+       QFont _font = WIDGET->font(); \
+       _font.setBold(BOLD); WIDGET->setFont(_font); \
+} \
+while(0)
 
-#define SET_FONT_BOLD(WIDGET,BOLD) { QFont _font = WIDGET->font(); _font.setBold(BOLD); WIDGET->setFont(_font); }
+#define SET_TEXT_COLOR(WIDGET, COLOR) do \
+{ \
+       QPalette _palette = WIDGET->palette(); \
+       _palette.setColor(QPalette::WindowText, (COLOR)); \
+       _palette.setColor(QPalette::Text, (COLOR)); \
+       WIDGET->setPalette(_palette); \
+} \
+while(0)
+
+#define UPDATE_MIN_WIDTH(WIDGET) do \
+{ \
+       if(WIDGET->width() > WIDGET->minimumWidth()) WIDGET->setMinimumWidth(WIDGET->width()); \
+} \
+while(0)
+
+////////////////////////////////////////////////////////////
+
+//Dummy class for UserData
+class IntUserData : public QObjectUserData
+{
+public:
+       IntUserData(int value) : m_value(value) {/*NOP*/}
+       int value(void) { return m_value; }
+       void setValue(int value) { m_value = value; }
+private:
+       int m_value;
+};
 
 ////////////////////////////////////////////////////////////
 // Constructor
 ProcessingDialog::ProcessingDialog(FileListModel *fileListModel, AudioFileModel *metaInfo, SettingsModel *settings, QWidget *parent)
 :
        QDialog(parent),
+       ui(new Ui::ProcessingDialog),
        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_progressViewFilter(-1),
+       m_firstShow(true)
 {
        //Init the dialog, from the .ui file
-       setupUi(this);
+       ui->setupUi(this);
        setWindowFlags(windowFlags() ^ Qt::WindowContextHelpButtonHint);
        
+       //Update header icon
+       ui->label_headerIcon->setPixmap(lamexp_app_icon().pixmap(ui->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);
+       ui->label_versionInfo->setText(QString().sprintf("v%d.%02d %s (Build %d)", lamexp_version_major(), lamexp_version_minor(), lamexp_version_release(), lamexp_version_build()));
+       ui->label_versionInfo->installEventFilter(this);
 
        //Register meta type
        qRegisterMetaType<QUuid>("QUuid");
@@ -115,33 +173,85 @@ ProcessingDialog::ProcessingDialog(FileListModel *fileListModel, AudioFileModel
        setMinimumSize(thisRect.width(), thisRect.height());
 
        //Enable buttons
-       connect(button_AbortProcess, SIGNAL(clicked()), this, SLOT(abortEncoding()));
+       connect(ui->button_AbortProcess, SIGNAL(clicked()), this, SLOT(abortEncoding()));
        
        //Init progress indicator
        m_progressIndicator = new QMovie(":/images/Working.gif");
-       label_headerWorking->setMovie(m_progressIndicator);
-       progressBar->setValue(0);
+       m_progressIndicator->setCacheMode(QMovie::CacheAll);
+       m_progressIndicator->setSpeed(50);
+       ui->label_headerWorking->setMovie(m_progressIndicator);
+       ui->progressBar->setValue(0);
 
        //Init progress model
        m_progressModel = new ProgressModel();
-       view_log->setModel(m_progressModel);
-       view_log->verticalHeader()->setResizeMode(QHeaderView::ResizeToContents);
-       view_log->verticalHeader()->hide();
-       view_log->horizontalHeader()->setResizeMode(QHeaderView::ResizeToContents);
-       view_log->horizontalHeader()->setResizeMode(0, QHeaderView::Stretch);
+       ui->view_log->setModel(m_progressModel);
+       ui->view_log->verticalHeader()->setResizeMode(QHeaderView::ResizeToContents);
+       ui->view_log->verticalHeader()->hide();
+       ui->view_log->horizontalHeader()->setResizeMode(QHeaderView::ResizeToContents);
+       ui->view_log->horizontalHeader()->setResizeMode(0, QHeaderView::Stretch);
+       ui->view_log->viewport()->installEventFilter(this);
        connect(m_progressModel, SIGNAL(rowsInserted(QModelIndex,int,int)), this, SLOT(progressModelChanged()));
+       connect(m_progressModel, SIGNAL(rowsMoved(QModelIndex,int,int,QModelIndex,int)), this, SLOT(progressModelChanged()));
+       connect(m_progressModel, SIGNAL(rowsRemoved(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(ui->view_log, SIGNAL(activated(QModelIndex)), this, SLOT(logViewDoubleClicked(QModelIndex)));
+       connect(ui->view_log->horizontalHeader(), SIGNAL(sectionResized(int,int,int)), this, SLOT(logViewSectionSizeChanged(int,int,int)));
 
        //Create context menu
        m_contextMenu = new QMenu();
        QAction *contextMenuDetailsAction = m_contextMenu->addAction(QIcon(":/icons/zoom.png"), tr("Show details for selected job"));
        QAction *contextMenuShowFileAction = m_contextMenu->addAction(QIcon(":/icons/folder_go.png"), tr("Browse Output File Location"));
+       m_contextMenu->addSeparator();
+
+       //Create "filter" context menu
+       m_progressViewFilterGroup = new QActionGroup(this);
+       QAction *contextMenuFilterAction[5] = {NULL, NULL, NULL, NULL, NULL};
+       if(QMenu *filterMenu = m_contextMenu->addMenu(QIcon(":/icons/filter.png"), tr("Filter Log Items")))
+       {
+               contextMenuFilterAction[0] = filterMenu->addAction(m_progressModel->getIcon(ProgressModel::JobRunning), tr("Show Running Only"));
+               contextMenuFilterAction[1] = filterMenu->addAction(m_progressModel->getIcon(ProgressModel::JobComplete), tr("Show Succeeded Only"));
+               contextMenuFilterAction[2] = filterMenu->addAction(m_progressModel->getIcon(ProgressModel::JobFailed), tr("Show Failed Only"));
+               contextMenuFilterAction[3] = filterMenu->addAction(m_progressModel->getIcon(ProgressModel::JobSkipped), tr("Show Skipped Only"));
+               contextMenuFilterAction[4] = filterMenu->addAction(m_progressModel->getIcon(ProgressModel::JobState(-1)), tr("Show All Items"));
+               if(QAction *act = contextMenuFilterAction[0]) { m_progressViewFilterGroup->addAction(act); act->setCheckable(true); act->setData(ProgressModel::JobRunning); }
+               if(QAction *act = contextMenuFilterAction[1]) { m_progressViewFilterGroup->addAction(act); act->setCheckable(true); act->setData(ProgressModel::JobComplete); }
+               if(QAction *act = contextMenuFilterAction[2]) { m_progressViewFilterGroup->addAction(act); act->setCheckable(true); act->setData(ProgressModel::JobFailed); }
+               if(QAction *act = contextMenuFilterAction[3]) { m_progressViewFilterGroup->addAction(act); act->setCheckable(true); act->setData(ProgressModel::JobSkipped); }
+               if(QAction *act = contextMenuFilterAction[4]) { m_progressViewFilterGroup->addAction(act); act->setCheckable(true); act->setData(-1); act->setChecked(true); }
+       }
 
-       view_log->setContextMenuPolicy(Qt::CustomContextMenu);
-       connect(view_log, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(contextMenuTriggered(QPoint)));
+       //Create info label
+       if(m_filterInfoLabel = new QLabel(ui->view_log))
+       {
+               m_filterInfoLabel->setFrameShape(QFrame::NoFrame);
+               m_filterInfoLabel->setAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
+               m_filterInfoLabel->setUserData(0, new IntUserData(-1));
+               SET_FONT_BOLD(m_filterInfoLabel, true);
+               SET_TEXT_COLOR(m_filterInfoLabel, Qt::darkGray);
+               m_filterInfoLabel->setContextMenuPolicy(Qt::CustomContextMenu);
+               connect(m_filterInfoLabel, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(contextMenuTriggered(QPoint)));
+               m_filterInfoLabel->hide();
+       }
+       if(m_filterInfoLabelIcon = new QLabel(ui->view_log))
+       {
+               m_filterInfoLabelIcon->setFrameShape(QFrame::NoFrame);
+               m_filterInfoLabelIcon->setAlignment(Qt::AlignHCenter | Qt::AlignTop);
+               m_filterInfoLabelIcon->setContextMenuPolicy(Qt::CustomContextMenu);
+               const QIcon &ico = m_progressModel->getIcon(ProgressModel::JobState(-1));
+               m_filterInfoLabelIcon->setPixmap(ico.pixmap(16, 16));
+               connect(m_filterInfoLabelIcon, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(contextMenuTriggered(QPoint)));
+               m_filterInfoLabelIcon->hide();
+       }
+
+       //Connect context menu
+       ui->view_log->setContextMenuPolicy(Qt::CustomContextMenu);
+       connect(ui->view_log, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(contextMenuTriggered(QPoint)));
        connect(contextMenuDetailsAction, SIGNAL(triggered(bool)), this, SLOT(contextMenuDetailsActionTriggered()));
        connect(contextMenuShowFileAction, SIGNAL(triggered(bool)), this, SLOT(contextMenuShowFileActionTriggered()));
+       for(size_t i = 0; i < 5; i++)
+       {
+               if(contextMenuFilterAction[i]) connect(contextMenuFilterAction[i], SIGNAL(triggered(bool)), this, SLOT(contextMenuFilterActionTriggered()));
+       }
        SET_FONT_BOLD(contextMenuDetailsAction, true);
 
        //Enque jobs
@@ -154,7 +264,7 @@ ProcessingDialog::ProcessingDialog(FileListModel *fileListModel, AudioFileModel
        }
 
        //Translate
-       label_headerStatus->setText(QString("<b>%1</b><br>%2").arg(tr("Encoding Files"), tr("Your files are being encoded, please be patient...")));
+       ui->label_headerStatus->setText(QString("<b>%1</b><br>%2").arg(tr("Encoding Files"), tr("Your files are being encoded, please be patient...")));
        
        //Enable system tray icon
        connect(m_systemTray, SIGNAL(activated(QSystemTrayIcon::ActivationReason)), this, SLOT(systemTrayActivated(QSystemTrayIcon::ActivationReason)));
@@ -165,7 +275,10 @@ ProcessingDialog::ProcessingDialog(FileListModel *fileListModel, AudioFileModel
        m_allJobs.clear();
        m_succeededJobs.clear();
        m_failedJobs.clear();
+       m_skippedJobs.clear();
        m_userAborted = false;
+       m_forcedAbort = false;
+       m_timerStart = 0I64;
 }
 
 ////////////////////////////////////////////////////////////
@@ -174,7 +287,7 @@ ProcessingDialog::ProcessingDialog(FileListModel *fileListModel, AudioFileModel
 
 ProcessingDialog::~ProcessingDialog(void)
 {
-       view_log->setModel(NULL);
+       ui->view_log->setModel(NULL);
 
        if(m_progressIndicator)
        {
@@ -184,17 +297,30 @@ 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);
-       LAMEXP_DELETE(m_progressModel);
-       LAMEXP_DELETE(m_contextMenu);
-       LAMEXP_DELETE(m_systemTray);
-       LAMEXP_DELETE(m_diskObserver);
-
-       WinSevenTaskbar::setOverlayIcon(this, NULL);
-       WinSevenTaskbar::setTaskbarState(this, WinSevenTaskbar::WinSevenTaskbarNoState);
 
        while(!m_threadList.isEmpty())
        {
@@ -203,6 +329,22 @@ ProcessingDialog::~ProcessingDialog(void)
                thread->wait(15000);
                delete thread;
        }
+
+       LAMEXP_DELETE(m_progressIndicator);
+       LAMEXP_DELETE(m_systemTray);
+       LAMEXP_DELETE(m_diskObserver);
+       LAMEXP_DELETE(m_cpuObserver);
+       LAMEXP_DELETE(m_ramObserver);
+       LAMEXP_DELETE(m_progressViewFilterGroup);
+       LAMEXP_DELETE(m_filterInfoLabel);
+       LAMEXP_DELETE(m_filterInfoLabelIcon);
+       LAMEXP_DELETE(m_contextMenu);
+       LAMEXP_DELETE(m_progressModel);
+
+       WinSevenTaskbar::setOverlayIcon(this, NULL);
+       WinSevenTaskbar::setTaskbarState(this, WinSevenTaskbar::WinSevenTaskbarNoState);
+
+       LAMEXP_DELETE(ui);
 }
 
 ////////////////////////////////////////////////////////////
@@ -211,22 +353,37 @@ 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);
+               ui->button_closeDialog->setEnabled(false);
+               ui->button_AbortProcess->setEnabled(false);
+               m_systemTray->setVisible(true);
+       
+               if(!SetPriorityClass(GetCurrentProcess(), ABOVE_NORMAL_PRIORITY_CLASS))
+               {
+                       SetPriorityClass(GetCurrentProcess(), HIGH_PRIORITY_CLASS);
+               }
+
+               ui->label_cpu->setText(NA);
+               ui->label_disk->setText(NA);
+               ui->label_ram->setText(NA);
+
+               QTimer::singleShot(1000, this, SLOT(initEncoding()));
+               m_firstShow = false;
        }
 
-       QTimer::singleShot(1000, this, SLOT(initEncoding()));
+       //Force update geometry
+       resizeEvent(NULL);
 }
 
 void ProcessingDialog::closeEvent(QCloseEvent *event)
 {
-       if(!button_closeDialog->isEnabled())
+       if(!ui->button_closeDialog->isEnabled())
        {
                event->ignore();
        }
@@ -240,20 +397,20 @@ bool ProcessingDialog::eventFilter(QObject *obj, QEvent *event)
 {
        static QColor defaultColor = QColor();
 
-       if(obj == label_versionInfo)
+       if(obj == ui->label_versionInfo)
        {
                if(event->type() == QEvent::Enter)
                {
-                       QPalette palette = label_versionInfo->palette();
+                       QPalette palette = ui->label_versionInfo->palette();
                        defaultColor = palette.color(QPalette::Normal, QPalette::WindowText);
                        palette.setColor(QPalette::Normal, QPalette::WindowText, Qt::red);
-                       label_versionInfo->setPalette(palette);
+                       ui->label_versionInfo->setPalette(palette);
                }
                else if(event->type() == QEvent::Leave)
                {
-                       QPalette palette = label_versionInfo->palette();
+                       QPalette palette = ui->label_versionInfo->palette();
                        palette.setColor(QPalette::Normal, QPalette::WindowText, defaultColor);
-                       label_versionInfo->setPalette(palette);
+                       ui->label_versionInfo->setPalette(palette);
                }
                else if(event->type() == QEvent::MouseButtonPress)
                {
@@ -265,31 +422,81 @@ 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);
+       }
+}
+
+/*
+ * Window was resized
+ */
+void ProcessingDialog::resizeEvent(QResizeEvent *event)
+{
+       if(event) QDialog::resizeEvent(event);
+
+       if(QWidget *port = ui->view_log->viewport())
+       {
+               QRect geom = port->geometry();
+               m_filterInfoLabel->setGeometry(geom.left() + 16, geom.top() + 16, geom.width() - 32, 48);
+               m_filterInfoLabelIcon->setGeometry(geom.left() + 16, geom.top() + 64, geom.width() - 32, geom.height() - 80);
+       }
+}
+
+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_skippedJobs.clear();
        m_userAborted = false;
+       m_forcedAbort = false;
        m_playList.clear();
-       
-       CHANGE_BACKGROUND_COLOR(frame_header, QColor(Qt::white));
+
+       DecoderRegistry::configureDecoders(m_settings);
+
+       CHANGE_BACKGROUND_COLOR(ui->frame_header, QColor(Qt::white));
        SET_PROGRESS_TEXT(tr("Encoding files, please wait..."));
        m_progressIndicator->start();
        
-       button_closeDialog->setEnabled(false);
-       button_AbortProcess->setEnabled(true);
-       progressBar->setRange(0, m_pendingJobs.count());
-       checkBox_shutdownComputer->setEnabled(true);
-       checkBox_shutdownComputer->setChecked(false);
+       ui->button_closeDialog->setEnabled(false);
+       ui->button_AbortProcess->setEnabled(true);
+       ui->progressBar->setRange(0, m_pendingJobs.count());
+       ui->checkBox_shutdownComputer->setEnabled(true);
+       ui->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 +504,54 @@ 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();
+               qApp->processEvents();
+       }
+
+       LARGE_INTEGER counter;
+       if(QueryPerformanceCounter(&counter))
+       {
+               m_timerStart = counter.QuadPart;
        }
 }
 
-void ProcessingDialog::abortEncoding(void)
+void ProcessingDialog::abortEncoding(bool force)
 {
        m_userAborted = true;
-       button_AbortProcess->setEnabled(false);
-       
+       if(force) m_forcedAbort = true;
+       ui->button_AbortProcess->setEnabled(false);
        SET_PROGRESS_TEXT(tr("Aborted! Waiting for running jobs to terminate..."));
 
        for(int i = 0; i < m_threadList.count(); i++)
@@ -336,12 +563,12 @@ void ProcessingDialog::abortEncoding(void)
 void ProcessingDialog::doneEncoding(void)
 {
        m_runningThreads--;
-       progressBar->setValue(progressBar->value() + 1);
+       ui->progressBar->setValue(ui->progressBar->value() + 1);
        
        if(!m_userAborted)
        {
-               SET_PROGRESS_TEXT(tr("Encoding: %1 files of %2 completed so far, please wait...").arg(QString::number(progressBar->value()), QString::number(progressBar->maximum())));
-               WinSevenTaskbar::setTaskbarProgress(this, progressBar->value(), progressBar->maximum());
+               SET_PROGRESS_TEXT(tr("Encoding: %n file(s) of %1 completed so far, please wait...", "", ui->progressBar->value()).arg(QString::number(ui->progressBar->maximum())));
+               WinSevenTaskbar::setTaskbarProgress(this, ui->progressBar->value(), ui->progressBar->maximum());
        }
        
        int index = m_threadList.indexOf(dynamic_cast<ProcessThread*>(QWidget::sender()));
@@ -375,23 +602,43 @@ void ProcessingDialog::doneEncoding(void)
        
        if(m_userAborted)
        {
-               CHANGE_BACKGROUND_COLOR(frame_header, QColor("#FFF3BA"));
+               CHANGE_BACKGROUND_COLOR(ui->frame_header, QColor("#FFF3BA"));
                WinSevenTaskbar::setTaskbarState(this, WinSevenTaskbar::WinSevenTaskbarErrorState);
                WinSevenTaskbar::setOverlayIcon(this, &QIcon(":/icons/error.png"));
-               SET_PROGRESS_TEXT((m_succeededJobs.count() > 0) ? tr("Process was aborted by the user after %1 file(s)!").arg(QString::number(m_succeededJobs.count())) : tr("Process was aborted prematurely by the user!"));
+               SET_PROGRESS_TEXT((m_succeededJobs.count() > 0) ? tr("Process was aborted by the user after %n file(s)!", "", m_succeededJobs.count()) : tr("Process was aborted prematurely by the user!"));
                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"));
+                       CHANGE_BACKGROUND_COLOR(ui->frame_header, QColor("#FFBABA"));
                        WinSevenTaskbar::setTaskbarState(this, WinSevenTaskbar::WinSevenTaskbarErrorState);
                        WinSevenTaskbar::setOverlayIcon(this, &QIcon(":/icons/exclamation.png"));
-                       SET_PROGRESS_TEXT(tr("Error: %1 of %2 files failed. Double-click failed items for detailed information!").arg(QString::number(m_failedJobs.count()), QString::number(m_failedJobs.count() + m_succeededJobs.count())));
+                       if(m_skippedJobs.count() > 0)
+                       {
+                               SET_PROGRESS_TEXT(tr("Error: %1 of %2 files failed (%3 files skipped). Double-click failed items for detailed information!").arg(QString::number(m_failedJobs.count()), QString::number(m_failedJobs.count() + m_succeededJobs.count() + m_skippedJobs.count()), QString::number(m_skippedJobs.count())));
+                       }
+                       else
+                       {
+                               SET_PROGRESS_TEXT(tr("Error: %1 of %2 files failed. Double-click failed items for detailed information!").arg(QString::number(m_failedJobs.count()), QString::number(m_failedJobs.count() + m_succeededJobs.count())));
+                       }
                        m_systemTray->showMessage(tr("LameXP - Error"), tr("At least one file has failed!"), QSystemTrayIcon::Critical);
                        m_systemTray->setIcon(QIcon(":/icons/cd_delete.png"));
                        QApplication::processEvents();
@@ -399,10 +646,17 @@ void ProcessingDialog::doneEncoding(void)
                }
                else
                {
-                       CHANGE_BACKGROUND_COLOR(frame_header, QColor("#E0FFE2"));
+                       CHANGE_BACKGROUND_COLOR(ui->frame_header, QColor("#E0FFE2"));
                        WinSevenTaskbar::setTaskbarState(this, WinSevenTaskbar::WinSevenTaskbarNormalState);
                        WinSevenTaskbar::setOverlayIcon(this, &QIcon(":/icons/accept.png"));
-                       SET_PROGRESS_TEXT(tr("All files completed successfully."));
+                       if(m_skippedJobs.count() > 0)
+                       {
+                               SET_PROGRESS_TEXT(tr("All files completed successfully. Skipped %1 files.").arg(QString::number(m_skippedJobs.count())));
+                       }
+                       else
+                       {
+                               SET_PROGRESS_TEXT(tr("All files completed successfully."));
+                       }
                        m_systemTray->showMessage(tr("LameXP - Done"), tr("All files completed successfully."), QSystemTrayIcon::Information);
                        m_systemTray->setIcon(QIcon(":/icons/cd_add.png"));
                        QApplication::processEvents();
@@ -411,44 +665,61 @@ void ProcessingDialog::doneEncoding(void)
        }
        
        setCloseButtonEnabled(true);
-       button_closeDialog->setEnabled(true);
-       button_AbortProcess->setEnabled(false);
-       checkBox_shutdownComputer->setEnabled(false);
+       ui->button_closeDialog->setEnabled(true);
+       ui->button_AbortProcess->setEnabled(false);
+       ui->checkBox_shutdownComputer->setEnabled(false);
 
        m_progressModel->restoreHiddenItems();
-       view_log->scrollToBottom();
+       ui->view_log->scrollToBottom();
        m_progressIndicator->stop();
-       progressBar->setValue(progressBar->maximum());
-       WinSevenTaskbar::setTaskbarProgress(this, progressBar->value(), progressBar->maximum());
+       ui->progressBar->setValue(ui->progressBar->maximum());
+       WinSevenTaskbar::setTaskbarProgress(this, ui->progressBar->value(), ui->progressBar->maximum());
 
        QApplication::restoreOverrideCursor();
 
-       if(!m_userAborted && checkBox_shutdownComputer->isChecked())
+       if(!m_userAborted && ui->checkBox_shutdownComputer->isChecked())
        {
                if(shutdownComputer())
                {
-                       m_shutdownFlag = true;
+                       m_shutdownFlag = m_settings->hibernateComputer() ? shutdownFlag_Hibernate : shutdownFlag_TurnPowerOff;
                        accept();
                }
        }
 }
 
-void ProcessingDialog::processFinished(const QUuid &jobId, const QString &outFileName, bool success)
+void ProcessingDialog::processFinished(const QUuid &jobId, const QString &outFileName, int success)
 {
-       if(success)
+       if(success > 0)
        {
                m_playList.insert(jobId, outFileName);
                m_succeededJobs.append(jobId);
        }
+       else if(success < 0)
+       {
+               m_playList.insert(jobId, outFileName);
+               m_skippedJobs.append(jobId);
+       }
        else
        {
                m_failedJobs.append(jobId);
        }
+
+       //Update filter as soon as a job finished!
+       if(m_progressViewFilter >= 0)
+       {
+               QTimer::singleShot(0, this, SLOT(progressViewFilterChanged()));
+       }
 }
 
 void ProcessingDialog::progressModelChanged(void)
 {
-       view_log->scrollToBottom();
+       //Update filter as soon as the model changes!
+       if(m_progressViewFilter >= 0)
+       {
+               QTimer::singleShot(0, this, SLOT(progressViewFilterChanged()));
+       }
+
+       QTimer::singleShot(0, ui->view_log, SLOT(scrollToBottom()));
 }
 
 void ProcessingDialog::logViewDoubleClicked(const QModelIndex &index)
@@ -466,7 +737,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
@@ -475,6 +746,17 @@ void ProcessingDialog::logViewDoubleClicked(const QModelIndex &index)
        }
 }
 
+void ProcessingDialog::logViewSectionSizeChanged(int logicalIndex, int oldSize, int newSize)
+{
+       if(logicalIndex == 1)
+       {
+               if(QHeaderView *hdr = ui->view_log->horizontalHeader())
+               {
+                       hdr->setMinimumSectionSize(qMax(hdr->minimumSectionSize(), hdr->sectionSize(1)));
+               }
+       }
+}
+
 void ProcessingDialog::contextMenuTriggered(const QPoint &pos)
 {
        QAbstractScrollArea *scrollArea = dynamic_cast<QAbstractScrollArea*>(QObject::sender());
@@ -488,14 +770,14 @@ void ProcessingDialog::contextMenuTriggered(const QPoint &pos)
 
 void ProcessingDialog::contextMenuDetailsActionTriggered(void)
 {
-       QModelIndex index = view_log->indexAt(view_log->mapFromGlobal(m_contextMenu->pos()));
-       logViewDoubleClicked(index.isValid() ? index : view_log->currentIndex());
+       QModelIndex index = ui->view_log->indexAt(ui->view_log->viewport()->mapFromGlobal(m_contextMenu->pos()));
+       logViewDoubleClicked(index.isValid() ? index : ui->view_log->currentIndex());
 }
 
 void ProcessingDialog::contextMenuShowFileActionTriggered(void)
 {
-       QModelIndex index = view_log->indexAt(view_log->mapFromGlobal(m_contextMenu->pos()));
-       const QUuid &jobId = m_progressModel->getJobId(index.isValid() ? index : view_log->currentIndex());
+       QModelIndex index = ui->view_log->indexAt(ui->view_log->viewport()->mapFromGlobal(m_contextMenu->pos()));
+       const QUuid &jobId = m_progressModel->getJobId(index.isValid() ? index : ui->view_log->currentIndex());
        QString filePath = m_playList.value(jobId, QString());
 
        if(filePath.isEmpty())
@@ -535,6 +817,54 @@ void ProcessingDialog::contextMenuShowFileActionTriggered(void)
        }
 }
 
+void ProcessingDialog::contextMenuFilterActionTriggered(void)
+{
+       if(QAction *action = dynamic_cast<QAction*>(QObject::sender()))
+       {
+               if(action->data().type() == QVariant::Int)
+               {
+                       m_progressViewFilter = action->data().toInt();
+                       progressViewFilterChanged();
+                       QTimer::singleShot(0, this, SLOT(progressViewFilterChanged()));
+                       QTimer::singleShot(0, ui->view_log, SLOT(scrollToBottom()));
+                       action->setChecked(true);
+               }
+       }
+}
+
+/*
+ * Filter progress items
+ */
+void ProcessingDialog::progressViewFilterChanged(void)
+{
+       bool matchFound = false;
+
+       for(int i = 0; i < ui->view_log->model()->rowCount(); i++)
+       {
+               QModelIndex index = (m_progressViewFilter >= 0) ? m_progressModel->index(i, 0) : QModelIndex();
+               const bool bHide = index.isValid() ? (m_progressModel->getJobState(index) != m_progressViewFilter) : false;
+               ui->view_log->setRowHidden(i, bHide); matchFound = matchFound || (!bHide);
+       }
+
+       if((m_progressViewFilter >= 0) && (!matchFound))
+       {
+               if(m_filterInfoLabel->isHidden() || (dynamic_cast<IntUserData*>(m_filterInfoLabel->userData(0))->value() != m_progressViewFilter))
+               {
+                       dynamic_cast<IntUserData*>(m_filterInfoLabel->userData(0))->setValue(m_progressViewFilter);
+                       m_filterInfoLabel->setText(QString("<p>&raquo; %1 &laquo;</p>").arg(tr("None of the items matches the current filtering rules")));
+                       m_filterInfoLabel->show();
+                       m_filterInfoLabelIcon->setPixmap(m_progressModel->getIcon(static_cast<ProgressModel::JobState>(m_progressViewFilter)).pixmap(16, 16, QIcon::Disabled));
+                       m_filterInfoLabelIcon->show();
+                       resizeEvent(NULL);
+               }
+       }
+       else if(!m_filterInfoLabel->isHidden())
+       {
+               m_filterInfoLabel->hide();
+               m_filterInfoLabelIcon->hide();
+       }
+}
+
 ////////////////////////////////////////////////////////////
 // Private Functions
 ////////////////////////////////////////////////////////////
@@ -548,9 +878,76 @@ 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());
+       }
+       if(m_settings->overwriteMode() != SettingsModel::Overwrite_KeepBoth)
+       {
+               thread->setOverwriteMode((m_settings->overwriteMode() == SettingsModel::Overwrite_SkipFile), (m_settings->overwriteMode() == SettingsModel::Overwrite_Replaces));
+       }
+
+       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,int)), this, SLOT(processFinished(QUuid,QString,int)), Qt::QueuedConnection);
+       connect(thread, SIGNAL(processMessageLogged(QUuid,QString)), m_progressModel, SLOT(appendToLog(QUuid,QString)), Qt::QueuedConnection);
+       
+       //Give it a go!
+       m_runningThreads++;
+       thread->start();
+
+       //Give thread some advance
+       for(unsigned int i = 0; i < MAX_INSTANCES; i++)
+       {
+               QThread::yieldCurrentThread();
+       }
+}
+
+AbstractEncoder *ProcessingDialog::makeEncoder(bool *nativeResampling)
+{
+       AbstractEncoder *encoder =  NULL;
+       *nativeResampling = false;
+       
        switch(m_settings->compressionEncoder())
        {
        case SettingsModel::MP3Encoder:
@@ -566,7 +963,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());
@@ -585,7 +982,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;
@@ -593,13 +990,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:
@@ -624,6 +1042,25 @@ void ProcessingDialog::startNextJob(void)
                        encoder = flacEncoder;
                }
                break;
+       case SettingsModel::OpusEncoder:
+               {
+                       OpusEncoder *opusEncoder = new OpusEncoder();
+                       opusEncoder->setBitrate(m_settings->compressionBitrate());
+                       opusEncoder->setRCMode(m_settings->compressionRCMode());
+                       opusEncoder->setOptimizeFor(m_settings->opusOptimizeFor());
+                       opusEncoder->setEncodeComplexity(m_settings->opusComplexity());
+                       opusEncoder->setFrameSize(m_settings->opusFramesize());
+                       opusEncoder->setCustomParams(m_settings->customParametersOpus());
+                       encoder = opusEncoder;
+               }
+               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();
@@ -636,42 +1073,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)
@@ -683,8 +1085,11 @@ void ProcessingDialog::writePlayList(void)
        }
        
        //Init local variables
-       const static char *invalidChars = "\\/:*?\"<>|";
        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;
 
@@ -696,10 +1101,7 @@ void ProcessingDialog::writePlayList(void)
        }
 
        //Clean playlist name
-       for(int i = 0; invalidChars[i]; i++)
-       {
-               playListName = playListName.replace(invalidChars[i], ' ').simplified();
-       }
+       playListName = lamexp_clean_filename(playListName);
 
        //Create list of audio files
        for(int i = 0; i < m_allJobs.count(); i++)
@@ -708,6 +1110,18 @@ void ProcessingDialog::writePlayList(void)
                list << QDir::toNativeSeparators(QDir(m_settings->outputDir()).relativeFilePath(m_playList.value(m_allJobs.at(i), "N/A")));
        }
 
+       //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++)
        {
@@ -775,13 +1189,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)
+{
+       
+       ui->label_cpu->setText(QString().sprintf(" %d%%", qRound(val * 100.0)));
+       UPDATE_MIN_WIDTH(ui->label_cpu);
+}
+
+void ProcessingDialog::ramUsageHasChanged(const double val)
+{
+       
+       ui->label_ram->setText(QString().sprintf(" %d%%", qRound(val * 100.0)));
+       UPDATE_MIN_WIDTH(ui->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++;
+       }
+
+       ui->label_disk->setText(QString().sprintf(" %3.1f %s", space, postfixStr[postfix]));
+       UPDATE_MIN_WIDTH(ui->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..."));
        
@@ -832,3 +1276,65 @@ bool ProcessingDialog::shutdownComputer(void)
        progressDialog.close();
        return true;
 }
+
+QString ProcessingDialog::time2text(const double timeVal) const
+{
+       double intPart = 0;
+       double frcPart = modf(timeVal, &intPart);
+
+       QTime time = QTime().addSecs(qRound(intPart)).addMSecs(qRound(frcPart * 1000.0));
+
+       QString a, b;
+
+       if(time.hour() > 0)
+       {
+               a = tr("%n hour(s)", "", time.hour());
+               b = tr("%n minute(s)", "", time.minute());
+       }
+       else if(time.minute() > 0)
+       {
+               a = tr("%n minute(s)", "", time.minute());
+               b = tr("%n second(s)", "", time.second());
+       }
+       else
+       {
+               a = tr("%n second(s)", "", time.second());
+               b = tr("%n millisecond(s)", "", time.msec());
+       }
+
+       return QString("%1, %2").arg(a, 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);
+}