converter: added presets support, fixed flac preset, enabled 'cancel'

button


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

1 files changed, 11 insertions, 2 deletions

diff --git a/src/plugins/General/converter/converter.h b/src/plugins/General/converter/converter.h
index 080d3688d..0e69a4fdc 100644
--- a/src/plugins/General/converter/converter.h
+++ b/src/plugins/General/converter/converter.h
@@ -24,6 +24,8 @@
 #include <QThread>
 #include <QQueue>
 #include <QHash>
+#include <QVariantMap>
+#include <QMutex>
 #include <stdio.h>
 #include <qmmp/decoder.h>
 #include <qmmp/inputsource.h>
@@ -36,9 +38,13 @@ class Converter : public QThread
     Q_OBJECT
 public:
     explicit Converter(QObject *parent = 0);
+    virtual ~Converter();
 
-    void add(const QStringList &urls);
-    void add(const QString &url);
+    void add(const QStringList &urls, const QVariantMap &preset);
+    void add(const QString &url, const QVariantMap &preset);
+
+public slots:
+    void stop();
 
 signals:
     void progress(int percent);
@@ -50,6 +56,9 @@ private:
     bool convert(Decoder *decoder, FILE *file);
     QQueue <Decoder*> m_decoders;
     QHash <Decoder*, InputSource*> m_inputs;
+    QHash <Decoder*, QVariantMap> m_presets;
+    QMutex m_mutex;
+    bool m_user_stop;
 
 };