1 files changed, 143 insertions, 157 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;