X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fkthumb.h;h=63c5df0117b0f4d53dbec4e918e06add563e4a51;hb=a45d0e113511913867802d8cb6bed143eacf7696;hp=e2a9594de277e51a45c1c9fff9f3f2b522318968;hpb=d4828ad52cd3613bfb386d48b02646335d1a2a0f;p=kdenlive

diff --git a/src/kthumb.h b/src/kthumb.h
index e2a9594d..63c5df01 100644
--- a/src/kthumb.h
+++ b/src/kthumb.h
@@ -20,8 +20,6 @@
 
 #include <QPixmap>
 #include <QFile>
-#include <QThread>
-#include <QMutex>
 #include <QDomElement>
 #include <QFuture>
 
@@ -50,32 +48,6 @@ class Profile;
 
 class ClipManager;
 
-
-
-class MyThread : public QThread
-{
-    Q_OBJECT
-public:
-    virtual void run();
-    void init(KUrl url, QString target, double frame, double frameLength, int frequency, int channels, int arrayWidth);
-    bool isWorking();
-    bool stop_me;
-
-private:
-    QFile f;
-    KUrl m_url;
-    double m_frame;
-    double m_frameLength;
-    int m_frequency;
-    int m_channels;
-    int m_arrayWidth;
-    bool m_isWorking;
-
-signals:
-    void audioThumbProgress(const int);
-    void audioThumbOver();
-};
-
 class KThumb: public QObject
 {
 Q_OBJECT public:
@@ -104,11 +76,11 @@ public slots:
     static QImage getFrame(Mlt::Producer *producer, int framepos, int width, int height);
 
 private slots:
-    void slotAudioThumbProgress(const int progress);
     void slotAudioThumbOver();
+    void slotCreateAudioThumbs();
 
 private:
-    MyThread m_audioThumbProducer;
+    QFuture<void> m_audioThumbProducer;
     KUrl m_url;
     QString m_thumbFile;
     double m_dar;
@@ -117,6 +89,13 @@ private:
     QString m_id;
     QList <int> m_requestedThumbs;
     QFuture<void> m_future;
+    QFile m_audioThumbFile;
+    bool m_stopAudioThumbs;
+    double m_frame;
+    double m_frameLength;
+    int m_frequency;
+    int m_channels;
+    int m_arrayWidth;
     void doGetThumbs();
 
 signals: