#include <QPixmap>
#include <QFile>
-#include <QThread>
-#include <QMutex>
#include <QDomElement>
+#include <QFuture>
#include <KUrl>
/**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;
class ClipManager;
-
-
-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);
- 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;
- QObject *m_parent;
-
-signals:
- void audioThumbProgress(const int);
- void audioThumbOver();
-};
-
-class KThumb: public QObject {
+class KThumb: public QObject
+{
Q_OBJECT public:
- KThumb(ClipManager *clipManager, KUrl url, const QString &id, 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);
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();
+ void slotCreateAudioThumbs();
private:
- MyThread audioThumbProducer;
+ QFuture<void> 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;
+ QFile m_audioThumbFile;
+ bool m_stopAudioThumbs;
+ double m_frame;
+ double m_frameLength;
+ int m_frequency;
+ int m_channels;
+ int m_arrayWidth;
+ void doGetThumbs();
signals:
- void thumbReady(int, QPixmap);
+ void thumbReady(int, QImage);
void mainThumbReady(const QString &, QPixmap);
void audioThumbReady(QMap <int, QMap <int, QByteArray> >);
};