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

diff --git a/src/kthumb.h b/src/kthumb.h
index ffdf310a..e2a9594d 100644
--- a/src/kthumb.h
+++ b/src/kthumb.h
@@ -18,80 +18,111 @@
 #ifndef KTHUMB_H
 #define KTHUMB_H
 
-#include <qobject.h>
-#include <qpixmap.h>
-#include <qfile.h>
-#include <qthread.h>
+#include <QPixmap>
+#include <QFile>
+#include <QThread>
+#include <QMutex>
+#include <QDomElement>
+#include <QFuture>
 
-#include <kurl.h>
+#include <KUrl>
 
 #include <mlt++/Mlt.h>
 
+
 /**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 {
-    class Miracle;
-    class Consumer;
-    class Producer;
-    class Frame;
-    class Profile;
+namespace Mlt
+{
+class Miracle;
+class Consumer;
+class Producer;
+class Frame;
+class Profile;
 };
 
+class ClipManager;
+
 
-class MyThread : public QThread {
 
-    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;
+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;
-    };
+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:
+class KThumb: public QObject
+{
+Q_OBJECT public:
 
 
-     KThumb(KUrl url, int width, int height, 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);
-	static QPixmap getImage(KUrl url, int width, int height);
-/*	void getImage(KUrl url, int frame, int width, int height);
-	void getThumbs(KUrl url, int startframe, int endframe, int width, int height);*/
-	void stopAudioThumbs();
-	void removeAudioThumb();
-	void getAudioThumbs(int channel, double frame, double frameLength, int arrayWidth);
+    void extractImage(int frame, int frame2);
+    QPixmap extractImage(int frame, int width, int height);
+    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);
+     void getThumbs(KUrl url, int startframe, int endframe, int width, int height);*/
+    void stopAudioThumbs();
+    void removeAudioThumb();
+    void getAudioThumbs(int channel, double frame, double frameLength, int arrayWidth);
+    static QPixmap getImage(KUrl url, int frame, 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 thumbProducer;
-	KUrl m_url;
-	QString m_thumbFile;
-	int m_width;
-	int m_height;
-	Mlt::Profile *m_profile;
+    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 audioThumbReady(QMap <int, QMap <int, QByteArray> >);
+    void thumbReady(int, QImage);
+    void mainThumbReady(const QString &, QPixmap);
+    void audioThumbReady(QMap <int, QMap <int, QByteArray> >);
 };
 
 #endif