Fix hang on exit somewhere strange inside Qt on OS X.

[kdenlive] / src / kthumb.h

diff --git a/src/kthumb.h b/src/kthumb.h
index 3cb480c086d6f79d7ffbce1dbf38d168d1787368..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>
 
@@ -100,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> >);
 };