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

diff --git a/src/kthumb.h b/src/kthumb.h
index ae56c9f6..e2a9594d 100644
--- a/src/kthumb.h
+++ b/src/kthumb.h
@@ -23,6 +23,7 @@
 #include <QThread>
 #include <QMutex>
 #include <QDomElement>
+#include <QFuture>
 
 #include <KUrl>
 
@@ -32,13 +33,14 @@
 /**KRender encapsulates the client side of the interface to a renderer.
 From Kdenlive's point of view, you treat the KRender object as the
 renderer, and simply use it as if it was local. Calls are asyncrhonous -
-you send a call out, and then recieve the return value through the
+you send a call out, and then receive the return value through the
 relevant signal that get's emitted once the call completes.
   *@author Jason Wood
   */
 
 
-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,47 +70,29 @@ private:
     int m_channels;
     int m_arrayWidth;
     bool m_isWorking;
-    QObject *m_parent;
-};
-
-
-class ThumbThread : public QThread {
-    Q_OBJECT
-public:
-    virtual void run();
-    void init(QObject *parent, Mlt::Producer *prod, int width, int height);
-    void setThumbFrames(Mlt::Producer *prod, int frame1, int frame2);
-    bool isWorking();
-    bool stop_me;
-
-private:
-    int m_width;
-    int m_height;
-    int m_frame1;
-    int m_frame2;
-    Mlt::Producer *m_prod;
-    bool m_isWorking;
-    QObject *m_parent;
-    //QMutex mutex;
 
 signals:
-    void gotStartThumb(QImage);
-    void gotEndThumb(QImage);
-
+    void audioThumbProgress(const int);
+    void audioThumbOver();
 };
 
-class KThumb: public QObject {
+class KThumb: public QObject
+{
 Q_OBJECT public:
 
 
-    KThumb(ClipManager *clipManager, KUrl url, QObject * parent = 0, const char *name = 0);
+    KThumb(ClipManager *clipManager, KUrl url, const QString &id, const QString &hash, QObject * parent = 0, const char *name = 0);
     ~KThumb();
     void setProducer(Mlt::Producer *producer);
+    void askForAudioThumbs(const QString &id);
+    bool hasProducer() const;
+    void clearProducer();
+    void updateThumbUrl(const QString &hash);
 
 public slots:
     void extractImage(int frame, int frame2);
     QPixmap extractImage(int frame, int width, int height);
-    void updateClipUrl(KUrl url);
+    void updateClipUrl(KUrl url, const QString &hash);
     static QPixmap getImage(KUrl url, int width, int height);
 //    static QPixmap getImage(QDomElement xml, int frame, int width, int height);
     /* void getImage(KUrl url, int frame, int width, int height);
@@ -116,21 +101,27 @@ 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);
 
-protected:
-    virtual void customEvent(QEvent * event);
+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;
+    QList <int> m_requestedThumbs;
+    QFuture<void> m_future;
+    void doGetThumbs();
 
 signals:
-    void thumbReady(int frame, QPixmap pm);
+    void thumbReady(int, QImage);
+    void mainThumbReady(const QString &, QPixmap);
     void audioThumbReady(QMap <int, QMap <int, QByteArray> >);
 };