converter: multi-thread support

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@6068 90c681e8-e032-0410-971d-27865f9a5e38

7 files changed, 346 insertions, 312 deletions

diff --git a/src/plugins/General/converter/converter.cpp b/src/plugins/General/converter/converter.cpp
index 655eb780b..063192932 100644
--- a/src/plugins/General/converter/converter.cpp
+++ b/src/plugins/General/converter/converter.cpp
@@ -35,28 +35,36 @@
 
 #define QStringToTString_qt4(s) TagLib::String(s.toUtf8().constData(), TagLib::String::UTF8)
 
-Converter::Converter(QObject *parent) : QThread(parent)
-{}
-
-Converter::~Converter()
+Converter::Converter(QObject *parent) : QObject(parent), QRunnable()
 {
-    stop();
+    m_user_stop = false;
+    m_decoder = 0;
+    m_input = 0;
 }
 
-void Converter::add(const QStringList &urls, const QVariantMap &preset)
+Converter::~Converter()
 {
-    foreach(QString url, urls)
-        add(url, preset);
+    qDebug("%s", Q_FUNC_INFO);
+    if(m_decoder)
+    {
+        delete m_decoder;
+        m_decoder = 0;
+    }
+    if(m_input)
+    {
+        delete m_input;
+        m_input = 0;
+    }
 }
 
-void Converter::add(const QString &url, const QVariantMap &preset)
+bool Converter::prepare(const QString &url, const QVariantMap &preset)
 {
     InputSource *source = InputSource::create(url, this);
     if(!source->initialize())
     {
         delete source;
         qWarning("Converter: Invalid url");
-        return;
+        return false;
     }
 
     if(source->ioDevice())
@@ -66,7 +74,7 @@ void Converter::add(const QString &url, const QVariantMap &preset)
             source->deleteLater();
             qWarning("Converter: cannot open input stream, error: %s",
                      qPrintable(source->ioDevice()->errorString()));
-            return;
+            return false;
         }
     }
 
@@ -84,7 +92,7 @@ void Converter::add(const QString &url, const QVariantMap &preset)
     {
         qWarning("Converter: unsupported file format");
         source->deleteLater();
-        return;
+        return false;
     }
     qDebug("Converter: selected decoder: %s",qPrintable(factory->properties().shortName));
     if(factory->properties().noInput && source->ioDevice())
@@ -95,14 +103,14 @@ void Converter::add(const QString &url, const QVariantMap &preset)
         qWarning("Converter: invalid file format");
         source->deleteLater();
         delete decoder;
-        return;
+        return false;
     }
-    m_decoders.enqueue(decoder);
-    m_inputs.insert(decoder, source);
-    m_presets.insert(decoder, preset);
+    m_decoder = decoder;
+    m_input = source;
+    m_preset = preset;
     if(!decoder->totalTime())
         source->setOffset(-1);
-    source->setParent(this);
+    return true;
 }
 
 void Converter::stop()
@@ -110,177 +118,154 @@ void Converter::stop()
     m_mutex.lock();
     m_user_stop = true;
     m_mutex.unlock();
-    wait();
-    m_presets.clear();
-    qDeleteAll(m_inputs.values());
-    m_inputs.clear();
-    qDeleteAll(m_decoders);
-    m_decoders.clear();
 }
 
 void Converter::run()
 {
     qDebug("Converter: staring thread");
     m_user_stop = false;
-    MetaDataFormatter desc_formatter("%p%if(%p&%t, - ,)%t [%l]");
-
-    while(!m_decoders.isEmpty())
-    {
-        Decoder *decoder = m_decoders.dequeue();
-        QVariantMap preset = m_presets.take(decoder);
-        AudioParameters ap = decoder->audioParameters();
-        QString url = m_inputs[decoder]->url();
-        QString out_path = preset["out_dir"].toString();
-        QString pattern = preset["file_name"].toString();
 
-        QList <FileInfo *> list = MetaDataManager::instance()->createPlayList(url);
+    AudioParameters ap = m_decoder->audioParameters();
+    QString url = m_input->url();
+    QString out_path = m_preset["out_dir"].toString();
+    QString pattern = m_preset["file_name"].toString();
 
-        if(list.isEmpty() || out_path.isEmpty() || pattern.isEmpty())
-        {
-            qWarning("Converter: invalid parameters");
-            m_inputs.take(decoder)->deleteLater();
-            delete decoder;
-            continue;
-        }
+    QList <FileInfo *> list = MetaDataManager::instance()->createPlayList(url);
 
-        QMap<Qmmp::MetaData, QString> metadata = list[0]->metaData();
-        MetaDataFormatter formatter(pattern);
+    if(list.isEmpty() || out_path.isEmpty() || pattern.isEmpty())
+    {
+        qWarning("Converter: invalid parameters");
+        return;
+    }
 
-        QString desc = tr("Track: %1").arg(desc_formatter.format(list[0]->metaData(), list[0]->length()));
-        desc += "\n";
-        desc += tr("Preset: %1").arg(preset["name"].toString());
-        emit desriptionChanged(desc);
+    QMap<Qmmp::MetaData, QString> metadata = list[0]->metaData();
+    MetaDataFormatter formatter(pattern);
 
-        QString name = formatter.format(list[0]->metaData(), list[0]->length());
-        QString full_path = out_path + "/" + name + "." + preset["ext"].toString();
+    QString name = formatter.format(list[0]->metaData(), list[0]->length());
+    QString full_path = out_path + "/" + name + "." + m_preset["ext"].toString();
 
-        if(QFile::exists(full_path))
+    if(QFile::exists(full_path))
+    {
+        if(m_preset["overwrite"].toBool()) //remove previous file
+            QFile::remove(full_path);
+        else
         {
-            if(preset["overwrite"].toBool()) //remove previous file
-                QFile::remove(full_path);
-            else
+            int i = 0;
+            while(QFile::exists(full_path)) //create file with another name
             {
-                int i = 0;
-                while(QFile::exists(full_path)) //create file with another name
-                {
-                    ++i;
-                    full_path = out_path + "/" + name + QString("_%1.").arg(i) + preset["ext"].toString();
-                }
+                ++i;
+                full_path = out_path + "/" + name + QString("_%1.").arg(i) + m_preset["ext"].toString();
             }
         }
+    }
 
-        QString command = preset["command"].toString();
-        command.replace("%o", "\"" + full_path + "\"");
-        QString tmp_path = QDesktopServices::storageLocation(QDesktopServices::TempLocation) + "/tmp.wav";
-        bool use_file = command.contains("%i");
-        command.replace("%i", "\"" + tmp_path + "\"");
-
-        qDebug("Converter: starting task '%s'", qPrintable(preset["name"].toString()));
-
-        qDeleteAll(list);
-        list.clear();
-
-        char wave_header[] = { 0x52, 0x49, 0x46, 0x46, //"RIFF"
-                               0x00, 0x00, 0x00, 0x00, //(file size) - 8
-                               0x57, 0x41, 0x56, 0x45, //WAVE
-                               0x66, 0x6d, 0x74, 0x20, //"fmt "
-                               0x10, 0x00, 0x00, 0x00, //16 + extra format bytes
-                               0x01, 0x00, 0x02, 0x00, //PCM/uncompressed, channels
-                               0x00, 0x00, 0x00, 0x00, //sample rate
-                               0x00, 0x00, 0x00, 0x00, //average bytes per second
-                               0x04, 0x00, 0x10, 0x00, //block align, significant bits per sample
-                               0x64, 0x61, 0x74, 0x61, //"data"
-                               0x00, 0x00, 0x00, 0x00 }; //chunk size*/
-
-        quint16 sample_size = preset["use_16bit"].toBool() ? 2 : ap.sampleSize();
-        quint32 sample_rate = qToLittleEndian(ap.sampleRate());
-        quint16 channels = qToLittleEndian((quint16)ap.channels());
-        quint16 block_align = qToLittleEndian((quint16)sample_size * ap.channels());
-        quint16 bps = qToLittleEndian((quint16)sample_size * 8);
-        quint32 size = decoder->totalTime() * ap.sampleRate() * ap.channels() * sample_size / 1000;
-        size = qToLittleEndian(size);
-
-        memcpy(&wave_header[22], &channels, 2);
-        memcpy(&wave_header[24], &sample_rate, 4);
-        memcpy(&wave_header[32], &block_align, 2);
-        memcpy(&wave_header[34], &bps, 2);
-        memcpy(&wave_header[40], &size, 4);
-
-        FILE *enc_pipe = use_file ? fopen(qPrintable(tmp_path), "w+b") : popen(qPrintable(command), "w");
-        if(!enc_pipe)
-        {
-            qWarning("Converter: unable to open pipe");
-            m_inputs.take(decoder)->deleteLater();
-            delete decoder;
-            continue;
-
-        }
-        size_t to_write = sizeof(wave_header);
-        if(to_write != fwrite(&wave_header, 1, to_write, enc_pipe))
-        {
-            qWarning("Converter: output file write error");
-            m_inputs.take(decoder)->deleteLater();
-            delete decoder;
-            use_file ? fclose(enc_pipe) : pclose(enc_pipe);
-            continue;
-        }
+    QString command = m_preset["command"].toString();
+    command.replace("%o", "\"" + full_path + "\"");
+    QString tmp_path = QDesktopServices::storageLocation(QDesktopServices::TempLocation) + "/tmp.wav";
+    bool use_file = command.contains("%i");
+    command.replace("%i", "\"" + tmp_path + "\"");
+
+    qDebug("Converter: starting task '%s'", qPrintable(m_preset["name"].toString()));
+
+    qDeleteAll(list);
+    list.clear();
+
+    char wave_header[] = { 0x52, 0x49, 0x46, 0x46, //"RIFF"
+                           0x00, 0x00, 0x00, 0x00, //(file size) - 8
+                           0x57, 0x41, 0x56, 0x45, //WAVE
+                           0x66, 0x6d, 0x74, 0x20, //"fmt "
+                           0x10, 0x00, 0x00, 0x00, //16 + extra format bytes
+                           0x01, 0x00, 0x02, 0x00, //PCM/uncompressed, channels
+                           0x00, 0x00, 0x00, 0x00, //sample rate
+                           0x00, 0x00, 0x00, 0x00, //average bytes per second
+                           0x04, 0x00, 0x10, 0x00, //block align, significant bits per sample
+                           0x64, 0x61, 0x74, 0x61, //"data"
+                           0x00, 0x00, 0x00, 0x00 }; //chunk size*/
+
+    quint16 sample_size = m_preset["use_16bit"].toBool() ? 2 : ap.sampleSize();
+    quint32 sample_rate = qToLittleEndian(ap.sampleRate());
+    quint16 channels = qToLittleEndian((quint16)ap.channels());
+    quint16 block_align = qToLittleEndian((quint16)sample_size * ap.channels());
+    quint16 bps = qToLittleEndian((quint16)sample_size * 8);
+    quint32 size = m_decoder->totalTime() * ap.sampleRate() * ap.channels() * sample_size / 1000;
+    size = qToLittleEndian(size);
+
+    memcpy(&wave_header[22], &channels, 2);
+    memcpy(&wave_header[24], &sample_rate, 4);
+    memcpy(&wave_header[32], &block_align, 2);
+    memcpy(&wave_header[34], &bps, 2);
+    memcpy(&wave_header[40], &size, 4);
+
+    FILE *enc_pipe = use_file ? fopen(qPrintable(tmp_path), "w+b") : popen(qPrintable(command), "w");
+    if(!enc_pipe)
+    {
+        qWarning("Converter: unable to open pipe");
+        return;
 
-        convert(decoder, enc_pipe, preset["use_16bit"].toBool());
+    }
+    size_t to_write = sizeof(wave_header);
+    if(to_write != fwrite(&wave_header, 1, to_write, enc_pipe))
+    {
+        qWarning("Converter: output file write error");
         use_file ? fclose(enc_pipe) : pclose(enc_pipe);
-        m_inputs.take(decoder)->deleteLater();
-        delete decoder;
-        m_mutex.lock();
-        if(m_user_stop)
-        {
-            qDebug("Converter: task '%s' aborted", qPrintable(preset["name"].toString()));
-            m_mutex.unlock();
-            return;
-        }
-        else
-            qDebug("Converter: task '%s' finished with success", qPrintable(preset["name"].toString()));
+        return;
+    }
+
+    convert(m_decoder, enc_pipe, m_preset["use_16bit"].toBool());
+    use_file ? fclose(enc_pipe) : pclose(enc_pipe);
+    m_mutex.lock();
+    if(m_user_stop)
+    {
+        qDebug("Converter: task '%s' aborted", qPrintable(m_preset["name"].toString()));
         m_mutex.unlock();
+        return;
+    }
+    else
+        qDebug("Converter: task '%s' finished with success", qPrintable(m_preset["name"].toString()));
+    m_mutex.unlock();
 
-        if(use_file)
+    if(use_file)
+    {
+        qDebug("Converter: starting file encoding...");
+        //emit desriptionChanged(tr("Encoding..."));
+        enc_pipe = popen(qPrintable(command), "w");
+        if(!enc_pipe)
         {
-            qDebug("Converter: starting file encoding...");
-            emit desriptionChanged(tr("Encoding..."));
-            enc_pipe = popen(qPrintable(command), "w");
-            if(!enc_pipe)
-            {
-                qWarning("Converter: unable to start encoder");
-                QFile::remove(tmp_path);
-                continue;
-            }
-            pclose(enc_pipe);
-            qDebug("Converter: encoding finished");
+            qWarning("Converter: unable to start encoder");
             QFile::remove(tmp_path);
+            return;
         }
+        pclose(enc_pipe);
+        qDebug("Converter: encoding finished");
+        QFile::remove(tmp_path);
+    }
 
-        if(preset["tags"].toBool())
+    if(m_preset["tags"].toBool())
+    {
+        qDebug("Converter: writing tags");
+        TagLib::FileRef file(qPrintable(full_path));
+        if(file.tag())
         {
-            qDebug("Converter: writing tags");
-            TagLib::FileRef file(qPrintable(full_path));
-            if(file.tag())
+            file.tag()->setTitle(QStringToTString_qt4(metadata[Qmmp::TITLE]));
+            file.tag()->setArtist(QStringToTString_qt4(metadata[Qmmp::ARTIST]));
+            file.tag()->setAlbum(QStringToTString_qt4(metadata[Qmmp::ALBUM]));
+            file.tag()->setGenre(QStringToTString_qt4(metadata[Qmmp::GENRE]));
+            file.tag()->setComment(QStringToTString_qt4(metadata[Qmmp::COMMENT]));
+            file.tag()->setYear(metadata[Qmmp::YEAR].toUInt());
+            file.tag()->setTrack(metadata[Qmmp::TRACK].toUInt());
+
+            if(full_path.endsWith(".mp3", Qt::CaseInsensitive))
             {
-                file.tag()->setTitle(QStringToTString_qt4(metadata[Qmmp::TITLE]));
-                file.tag()->setArtist(QStringToTString_qt4(metadata[Qmmp::ARTIST]));
-                file.tag()->setAlbum(QStringToTString_qt4(metadata[Qmmp::ALBUM]));
-                file.tag()->setGenre(QStringToTString_qt4(metadata[Qmmp::GENRE]));
-                file.tag()->setComment(QStringToTString_qt4(metadata[Qmmp::COMMENT]));
-                file.tag()->setYear(metadata[Qmmp::YEAR].toUInt());
-                file.tag()->setTrack(metadata[Qmmp::TRACK].toUInt());
-
-                if(full_path.endsWith(".mp3", Qt::CaseInsensitive))
-                {
-                    TagLib::MPEG::File *mpeg_file = dynamic_cast <TagLib::MPEG::File *> (file.file());
-                    mpeg_file->save(TagLib::MPEG::File::ID3v2, true);
-                }
-                else
-                    file.save();
+                TagLib::MPEG::File *mpeg_file = dynamic_cast <TagLib::MPEG::File *> (file.file());
+                mpeg_file->save(TagLib::MPEG::File::ID3v2, true);
             }
+            else
+                file.save();
         }
     }
+
     qDebug("Converter: thread finished");
+    emit finished(this);
 }
 
 bool Converter::convert(Decoder *decoder, FILE *file, bool use16bit)
@@ -351,6 +336,7 @@ bool Converter::convert(Decoder *decoder, FILE *file, bool use16bit)
         }
         else if (len <= 0)
         {
+            emit progress(100);
             qDebug("Converter: total written: %lld bytes", total);
             qDebug("finished!");
             return true;
diff --git a/src/plugins/General/converter/converter.h b/src/plugins/General/converter/converter.h
index fcb69f7c9..e2f58d22e 100644
--- a/src/plugins/General/converter/converter.h
+++ b/src/plugins/General/converter/converter.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2011 by Ilya Kotov                                      *
+ *   Copyright (C) 2011-2016 by Ilya Kotov                                 *
  *   forkotov02@hotmail.ru                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -21,7 +21,8 @@
 #ifndef CONVERTER_H
 #define CONVERTER_H
 
-#include <QThread>
+#include <QRunnable>
+#include <QObject>
 #include <QQueue>
 #include <QHash>
 #include <QVariantMap>
@@ -33,30 +34,31 @@
 /**
     @author Ilya Kotov <forkotov02@hotmail.ru>
 */
-class Converter : public QThread
+class Converter : public QObject, public QRunnable
 {
     Q_OBJECT
 public:
     explicit Converter(QObject *parent = 0);
     virtual ~Converter();
 
-    void add(const QStringList &urls, const QVariantMap &preset);
-    void add(const QString &url, const QVariantMap &preset);
+    bool prepare(const QString &url, const QVariantMap &preset);
 
 public slots:
     void stop();
 
 signals:
     void progress(int percent);
-    void desriptionChanged(QString text);
-    void error(QString text);
+    void finished(Converter *converter);
 
 private:
     void run();
     bool convert(Decoder *decoder, FILE *file, bool use16bit);
-    QQueue <Decoder*> m_decoders;
-    QHash <Decoder*, InputSource*> m_inputs;
-    QHash <Decoder*, QVariantMap> m_presets;
+    //QQueue <Decoder*> m_decoders;
+    //QHash <Decoder*, InputSource*> m_inputs;
+    //QHash <Decoder*, QVariantMap> m_presets;
+    Decoder *m_decoder;
+    InputSource *m_input;
+    QVariantMap m_preset;
     QMutex m_mutex;
     bool m_user_stop;
 
diff --git a/src/plugins/General/converter/converterdialog.cpp b/src/plugins/General/converter/converterdialog.cpp
index ab75ed07f..7bfafe37c 100644
--- a/src/plugins/General/converter/converterdialog.cpp
+++ b/src/plugins/General/converter/converterdialog.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2011-2015 by Ilya Kotov                                 *
+ *   Copyright (C) 2011-2016 by Ilya Kotov                                 *
  *   forkotov02@hotmail.ru                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -23,26 +23,50 @@
 #include <QMenu>
 #include <QFile>
 #include <QDir>
+#include <QProgressBar>
+#include <QThreadPool>
 #include <qmmpui/playlistitem.h>
 #include <qmmpui/metadataformatter.h>
 #include <qmmpui/filedialog.h>
+#include <qmmp/metadatamanager.h>
+#include "converter.h"
 #include "preseteditor.h"
 #include "converterdialog.h"
 
-ConverterDialog::ConverterDialog(QList <PlayListTrack *> items,  QWidget *parent) : QDialog(parent)
+ConverterDialog::ConverterDialog(QList <PlayListTrack *> tracks,  QWidget *parent) : QDialog(parent)
 {
     m_ui.setupUi(this);
-    MetaDataFormatter formatter("%p%if(%p&%t, - ,)%t - %l");
-    foreach(PlayListTrack *item , items)
+    m_ui.tableWidget->verticalHeader()->setDefaultSectionSize(fontMetrics().height() + 3);
+    m_ui.tableWidget->verticalHeader()->setResizeMode(QHeaderView::Fixed);
+
+    QStringList paths;
+    MetaDataFormatter formatter("%if(%p&%t,%p - %t,%f) - %l");
+    foreach(PlayListTrack *track, tracks)
     {
-        if(item->length() == 0)
+        //skip streams
+        if(track->length() == 0 || track->url().contains("://"))
+            continue;
+        //skip duplicates
+        if(paths.contains(track->url()))
             continue;
-        QString text = formatter.format(item);
-        QListWidgetItem *listItem = new QListWidgetItem(text);
-        listItem->setData(Qt::UserRole, item->url());
-        listItem->setCheckState(Qt::Checked);
-        m_ui.itemsListWidget->addItem(listItem);
+        //skip unsupported files
+        if(!MetaDataManager::instance()->supports(track->url()))
+            continue;
+
+        paths.append(track->url());
+        QString name = formatter.format(track);
+        QTableWidgetItem *item = new QTableWidgetItem(name);
+        item->setData(Qt::UserRole, track->url());
+        item->setData(Qt::ToolTipRole, track->url());
+        m_ui.tableWidget->insertRow(m_ui.tableWidget->rowCount());
+        m_ui.tableWidget->setItem(m_ui.tableWidget->rowCount() - 1, 0, item);
+        QProgressBar *progressBar = new QProgressBar(this);
+        progressBar->setRange(0, 100);
+        m_ui.tableWidget->setCellWidget(m_ui.tableWidget->rowCount() - 1, 1, progressBar);
+
     }
+    m_ui.tableWidget->resizeColumnsToContents();
+
     QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
     settings.beginGroup("Converter");
     QString music_path = QDesktopServices::storageLocation(QDesktopServices::MusicLocation);
@@ -59,17 +83,7 @@ ConverterDialog::ConverterDialog(QList <PlayListTrack *> items,  QWidget *parent
 ConverterDialog::~ConverterDialog()
 {
     savePresets();
-}
-
-QStringList ConverterDialog::selectedUrls() const
-{
-    QStringList out;
-    for(int i = 0; i < m_ui.itemsListWidget->count(); i++)
-    {
-        if(m_ui.itemsListWidget->item(i)->checkState() == Qt::Checked)
-            out << m_ui.itemsListWidget->item(i)->data(Qt::UserRole).toString();
-    }
-    return out;
+    on_stopButton_clicked();
 }
 
 QVariantMap ConverterDialog::preset() const
@@ -93,6 +107,51 @@ void ConverterDialog::on_dirButton_clicked()
         m_ui.outDirEdit->setText(dir);
 }
 
+void ConverterDialog::on_convertButton_clicked()
+{
+    m_ui.convertButton->setEnabled(false);
+    m_converters.clear();
+    for(int i = 0; i < m_ui.tableWidget->rowCount(); ++i)
+    {
+        QString url = m_ui.tableWidget->item(i, 0)->data(Qt::UserRole).toString();
+        Converter *converter = new Converter();
+
+
+        if(!converter->prepare(url, preset()))
+        {
+            //m_ui.tableWidget->setItem(i, 2, new QTableWidgetItem(tr("Error")));
+            delete converter;
+            continue;
+        }
+
+        converter->setAutoDelete(false);
+        m_converters.append(converter);
+        connect(converter, SIGNAL(progress(int)), m_ui.tableWidget->cellWidget(i, 1), SLOT(setValue(int)));
+        connect(converter, SIGNAL(finished(Converter *)), SLOT(onConvertFinished(Converter *)));
+        QThreadPool::globalInstance()->start(converter);
+    }
+}
+
+void ConverterDialog::on_stopButton_clicked()
+{
+    if(m_converters.isEmpty())
+        return;
+
+    foreach(Converter *c, m_converters)
+        c->stop();
+    QThreadPool::globalInstance()->waitForDone();
+    qDeleteAll(m_converters);
+    m_converters.clear();
+}
+
+void ConverterDialog::onConvertFinished(Converter *c)
+{
+    m_converters.removeAll(c);
+    delete c;
+    if(m_converters.isEmpty())
+        m_ui.convertButton->setEnabled(true);
+}
+
 void ConverterDialog::accept()
 {
     QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
diff --git a/src/plugins/General/converter/converterdialog.h b/src/plugins/General/converter/converterdialog.h
index 9072d4e3a..d98756576 100644
--- a/src/plugins/General/converter/converterdialog.h
+++ b/src/plugins/General/converter/converterdialog.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2011-2015 by Ilya Kotov                                 *
+ *   Copyright (C) 2011-2016 by Ilya Kotov                                 *
  *   forkotov02@hotmail.ru                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -28,6 +28,7 @@
 class QAction;
 class PlayListTrack;
 class ConverterPreset;
+class Converter;
 
 /**
     @author Ilya Kotov <forkotov02@hotmail.ru>
@@ -39,14 +40,14 @@ public:
     explicit ConverterDialog(QList <PlayListTrack *> items,  QWidget *parent = 0);
     virtual ~ConverterDialog();
 
-    QStringList selectedUrls() const;
-    QVariantMap preset() const;
-
 public slots:
     virtual void accept();
 
 private slots:
     void on_dirButton_clicked();
+    void on_convertButton_clicked();
+    void on_stopButton_clicked();
+    void onConvertFinished(Converter *c);
     void addTitleString(QAction *a);
     void createPreset();
     void editPreset();
@@ -57,10 +58,12 @@ private:
     void createMenus();
     void readPresets(const QString &path);
     void savePresets();
+    QVariantMap preset() const;
     QString uniqueName(const QString &name);
 
     Ui::ConverterDialog m_ui;
     QList <ConverterPreset* > m_presets;
+    QList <Converter *> m_converters;
 
 };
 
diff --git a/src/plugins/General/converter/converterdialog.ui b/src/plugins/General/converter/converterdialog.ui
index 34e36fbd0..c408f497a 100644
--- a/src/plugins/General/converter/converterdialog.ui
+++ b/src/plugins/General/converter/converterdialog.ui
@@ -6,14 +6,14 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>433</width>
-    <height>428</height>
+    <width>598</width>
+    <height>430</height>
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Converter Settings</string>
+   <string>Converter</string>
   </property>
-  <layout class="QGridLayout" name="gridLayout">
+  <layout class="QGridLayout" name="gridLayout_2">
    <property name="leftMargin">
     <number>6</number>
    </property>
@@ -23,82 +23,114 @@
    <property name="bottomMargin">
     <number>6</number>
    </property>
-   <item row="0" column="0" colspan="2">
-    <widget class="QLabel" name="label">
-     <property name="text">
-      <string>Select tracks to convert:</string>
+   <item row="0" column="0" colspan="3">
+    <widget class="QTableWidget" name="tableWidget">
+     <property name="editTriggers">
+      <set>QAbstractItemView::NoEditTriggers</set>
+     </property>
+     <property name="selectionBehavior">
+      <enum>QAbstractItemView::SelectRows</enum>
+     </property>
+     <property name="rowCount">
+      <number>0</number>
      </property>
+     <column>
+      <property name="text">
+       <string>Title</string>
+      </property>
+     </column>
+     <column>
+      <property name="text">
+       <string>Progress</string>
+      </property>
+     </column>
     </widget>
    </item>
    <item row="1" column="0" colspan="3">
-    <widget class="QListWidget" name="itemsListWidget">
-     <property name="alternatingRowColors">
-      <bool>true</bool>
-     </property>
+    <widget class="QWidget" name="widget" native="true">
+     <layout class="QGridLayout" name="gridLayout">
+      <property name="margin">
+       <number>0</number>
+      </property>
+      <item row="0" column="0">
+       <widget class="QLabel" name="label_2">
+        <property name="text">
+         <string>Output directory:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <widget class="QLineEdit" name="outDirEdit"/>
+      </item>
+      <item row="0" column="2">
+       <widget class="QToolButton" name="dirButton">
+        <property name="text">
+         <string notr="true">...</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0">
+       <widget class="QLabel" name="label_3">
+        <property name="text">
+         <string>Output file name:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1">
+       <widget class="QLineEdit" name="outFileEdit"/>
+      </item>
+      <item row="1" column="2">
+       <widget class="QToolButton" name="fileNameButton">
+        <property name="text">
+         <string notr="true">...</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0">
+       <widget class="QLabel" name="label_4">
+        <property name="text">
+         <string>Preset:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1">
+       <widget class="QComboBox" name="presetComboBox"/>
+      </item>
+      <item row="2" column="2">
+       <widget class="QToolButton" name="presetButton">
+        <property name="text">
+         <string notr="true">...</string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="0" colspan="3">
+       <widget class="QCheckBox" name="overwriteCheckBox">
+        <property name="text">
+         <string>Overwrite existing files</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
     </widget>
    </item>
    <item row="2" column="0">
-    <widget class="QLabel" name="label_2">
+    <widget class="QPushButton" name="convertButton">
      <property name="text">
-      <string>Output directory:</string>
+      <string>Convert</string>
      </property>
     </widget>
    </item>
    <item row="2" column="1">
-    <widget class="QLineEdit" name="outDirEdit"/>
-   </item>
-   <item row="3" column="0">
-    <widget class="QLabel" name="label_3">
-     <property name="text">
-      <string>Output file name:</string>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="1">
-    <widget class="QLineEdit" name="outFileEdit"/>
-   </item>
-   <item row="4" column="0">
-    <widget class="QLabel" name="label_4">
+    <widget class="QPushButton" name="stopButton">
      <property name="text">
-      <string>Preset:</string>
+      <string>Stop</string>
      </property>
     </widget>
    </item>
-   <item row="4" column="1">
-    <widget class="QComboBox" name="presetComboBox"/>
-   </item>
-   <item row="5" column="0" colspan="3">
-    <widget class="QCheckBox" name="overwriteCheckBox">
-     <property name="text">
-      <string>Overwrite existing files</string>
-     </property>
-    </widget>
-   </item>
-   <item row="6" column="0" colspan="3">
+   <item row="2" column="2">
     <widget class="QDialogButtonBox" name="buttonBox">
      <property name="standardButtons">
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="2">
-    <widget class="QToolButton" name="dirButton">
-     <property name="text">
-      <string notr="true">...</string>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="2">
-    <widget class="QToolButton" name="fileNameButton">
-     <property name="text">
-      <string notr="true">...</string>
-     </property>
-    </widget>
-   </item>
-   <item row="4" column="2">
-    <widget class="QToolButton" name="presetButton">
-     <property name="text">
-      <string notr="true">...</string>
+      <set>QDialogButtonBox::Close</set>
      </property>
     </widget>
    </item>
@@ -108,33 +140,17 @@
  <connections>
   <connection>
    <sender>buttonBox</sender>
-   <signal>accepted()</signal>
-   <receiver>ConverterDialog</receiver>
-   <slot>accept()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>330</x>
-     <y>408</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>112</x>
-     <y>425</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>buttonBox</sender>
    <signal>rejected()</signal>
    <receiver>ConverterDialog</receiver>
    <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>393</x>
-     <y>407</y>
+     <x>591</x>
+     <y>423</y>
     </hint>
     <hint type="destinationlabel">
-     <x>383</x>
-     <y>425</y>
+     <x>399</x>
+     <y>104</y>
     </hint>
    </hints>
   </connection>
diff --git a/src/plugins/General/converter/converterhelper.cpp b/src/plugins/General/converter/converterhelper.cpp
index 2d7d92936..570fea80d 100644
--- a/src/plugins/General/converter/converterhelper.cpp
+++ b/src/plugins/General/converter/converterhelper.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2011 by Ilya Kotov                                      *
+ *   Copyright (C) 2011-2016 by Ilya Kotov                                 *
  *   forkotov02@hotmail.ru                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -20,13 +20,11 @@
 
 #include <QAction>
 #include <QApplication>
-#include <QProgressDialog>
 #include <qmmp/soundcore.h>
 #include <qmmpui/uihelper.h>
 #include <qmmpui/playlistmanager.h>
 #include <qmmpui/playlistitem.h>
 #include <qmmpui/mediaplayer.h>
-#include "converter.h"
 #include "converterdialog.h"
 #include "converterhelper.h"
 
@@ -36,21 +34,11 @@ ConverterHelper::ConverterHelper(QObject *parent) : QObject(parent)
     m_action->setShortcut(tr("Meta+C"));
     UiHelper::instance()->addAction(m_action, UiHelper::PLAYLIST_MENU);
     connect (m_action, SIGNAL(triggered ()), SLOT(openConverter()));
-    m_converter = new Converter(this);
-    m_progress = new QProgressDialog();
-    m_progress->setRange(0,100);
-    m_progress->setWindowTitle(tr("Converting..."));
-    m_progress->setCancelButtonText(tr("Cancel"));
-    connect(m_converter,SIGNAL(progress(int)),m_progress,SLOT(setValue(int)));
-    connect(m_converter, SIGNAL(finished()), m_progress, SLOT(reset()));
-    connect(m_converter, SIGNAL(desriptionChanged(QString)), m_progress, SLOT(setLabelText(QString)));
-    connect(m_progress, SIGNAL(canceled()), m_converter, SLOT(stop()));
+
 }
 
 ConverterHelper::~ConverterHelper()
-{
-    delete m_progress;
-}
+{}
 
 void ConverterHelper::openConverter()
 {
@@ -59,20 +47,6 @@ void ConverterHelper::openConverter()
     if (tracks.isEmpty())
         return;
 
-    ConverterDialog *d = new ConverterDialog(tracks, qApp->activeWindow ());
-    if(d->exec() == QDialog::Accepted)
-    {
-        QStringList urls = d->selectedUrls();
-        QVariantMap preset = d->preset();
-        if(preset.isEmpty())
-        {
-            d->deleteLater();
-            return;
-        }
-        m_converter->add(urls, preset);
-        if(!m_converter->isRunning())
-            m_converter->start();
-
-    }
-    d->deleteLater();
+    ConverterDialog d(tracks, qApp->activeWindow ());
+    d.exec();
 }
diff --git a/src/plugins/General/converter/converterhelper.h b/src/plugins/General/converter/converterhelper.h
index e91d12620..68d538c9c 100644
--- a/src/plugins/General/converter/converterhelper.h
+++ b/src/plugins/General/converter/converterhelper.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2011 by Ilya Kotov                                      *
+ *   Copyright (C) 2011-2016 by Ilya Kotov                                 *
  *   forkotov02@hotmail.ru                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -20,14 +20,11 @@
 #ifndef CONVERTERHELPER_H
 #define CONVERTERHELPER_H
 
-#include <QPointer>
-
 #include <qmmpui/general.h>
 #include <qmmp/qmmp.h>
 
 class QAction;
 class QProgressDialog;
-class Converter;
 
 /**
     @author Ilya Kotov <forkotov02@hotmail.ru>
@@ -45,9 +42,6 @@ private slots:
 
 private:
     QAction *m_action;
-    Converter *m_converter;
-    QProgressDialog *m_progress;
-
 };
 
 #endif