Fix audio thumbs not displayed on project opening and abortion if audio thumbs creation

[kdenlive] / src / kthumb.h

diff --git a/src/kthumb.h b/src/kthumb.h
index 53600f6836629bc360ba058387bb71e6a64de44e..e2a9594de277e51a45c1c9fff9f3f2b522318968 100644 (file)
--- a/src/kthumb.h
+++ b/src/kthumb.h
@@ -23,6 +23,7 @@
 #include <QThread>
 #include <QMutex>
 #include <QDomElement>
+#include <QFuture>
 
 #include <KUrl>
 
@@ -38,7 +39,8 @@ relevant signal that get's emitted once the call completes.
   */
 
 
-namespace Mlt {
+namespace Mlt
+{
 class Miracle;
 class Consumer;
 class Producer;
@@ -50,11 +52,12 @@ class ClipManager;
 
 
 
-class MyThread : public QThread {
+class MyThread : public QThread
+{
     Q_OBJECT
 public:
     virtual void run();
-    void init(QObject *parent, KUrl url, QString target, double frame, double frameLength, int frequency, int channels, int arrayWidth);
+    void init(KUrl url, QString target, double frame, double frameLength, int frequency, int channels, int arrayWidth);
     bool isWorking();
     bool stop_me;
 
@@ -67,14 +70,14 @@ private:
     int m_channels;
     int m_arrayWidth;
     bool m_isWorking;
-    QObject *m_parent;
 
 signals:
     void audioThumbProgress(const int);
     void audioThumbOver();
 };
 
-class KThumb: public QObject {
+class KThumb: public QObject
+{
 Q_OBJECT public:
 
 
@@ -98,24 +101,26 @@ public slots:
     void removeAudioThumb();
     void getAudioThumbs(int channel, double frame, double frameLength, int arrayWidth);
     static QPixmap getImage(KUrl url, int frame, int width, int height);
-    static QPixmap getFrame(Mlt::Producer *producer, int framepos, int width, int height);
+    static QImage getFrame(Mlt::Producer *producer, int framepos, int width, int height);
 
 private slots:
     void slotAudioThumbProgress(const int progress);
     void slotAudioThumbOver();
 
 private:
-    MyThread audioThumbProducer;
+    MyThread m_audioThumbProducer;
     KUrl m_url;
     QString m_thumbFile;
     double m_dar;
     Mlt::Producer *m_producer;
     ClipManager *m_clipManager;
     QString m_id;
-    int m_mainFrame;
+    QList <int> m_requestedThumbs;
+    QFuture<void> m_future;
+    void doGetThumbs();
 
 signals:
-    void thumbReady(int, QPixmap);
+    void thumbReady(int, QImage);
     void mainThumbReady(const QString &, QPixmap);
     void audioThumbReady(QMap <int, QMap <int, QByteArray> >);
 };