Add Mac OS X compatibility through new MLT sdl_audio consumer and a QTGLWidget!

[kdenlive] / src / renderer.h

diff --git a/src/renderer.h b/src/renderer.h
index fd237706b28841872d0503a83958362cf3ecbb84..74011cb25802e6b1948c6024bf84274950abdc6b 100644 (file)
--- a/src/renderer.h
+++ b/src/renderer.h
@@ -29,6 +29,10 @@
 #include <QList>
 #include <QEvent>
 
+#ifdef Q_WS_MAC
+#include "videoglwidget.h"
+#endif
+
 
 /**Render encapsulates the client side of the interface to a renderer.
 From Kdenlive's point of view, you treat the Render object as the
@@ -165,7 +169,7 @@ Q_OBJECT public:
     double dar() const;
 
     /** Playlist manipulation */
-    void mltInsertClip(ItemInfo info, QDomElement element, Mlt::Producer *prod);
+    int mltInsertClip(ItemInfo info, QDomElement element, Mlt::Producer *prod);
     void mltUpdateClip(ItemInfo info, QDomElement element, Mlt::Producer *prod);
     void mltCutClip(int track, GenTime position);
     void mltInsertSpace(QMap <int, int> trackClipStartList, QMap <int, int> trackTransitionStartList, int track, const GenTime duration, const GenTime timeOffset);
@@ -202,9 +206,12 @@ Q_OBJECT public:
     in the ClipManager list and speed is the current speed */
     int mltChangeClipSpeed(ItemInfo info, double speed, double oldspeed, int strobe, Mlt::Producer *prod);
 
-    QList <Mlt::Producer *> producersList();
+    const QList <Mlt::Producer *> producersList();
     void updatePreviewSettings();
     void setDropFrames(bool show);
+#ifdef Q_WS_MAC
+    void showFrame(Mlt::Frame&);
+#endif
 
 private:   // Private attributes & methods
     /** The name of this renderer - useful to identify the renderes by what they do - e.g. background rendering, workspace monitor, etc... */
@@ -232,9 +239,13 @@ private:   // Private attributes & methods
     /** A human-readable description of this renderer. */
     int m_winid;
 
+#ifdef Q_WS_MAC
+    VideoGLWidget *m_glWidget;
+#endif
+
     /** Sets the description of this renderer to desc. */
     void closeMlt();
-    void mltCheckLength();
+    void mltCheckLength(Mlt::Tractor *tractor);
     void mltPasteEffects(Mlt::Producer *source, Mlt::Producer *dest);
     QMap<QString, QString> mltGetTransitionParamsFromXml(QDomElement xml);
     QMap<QString, Mlt::Producer *> m_slowmotionProducers;
@@ -274,6 +285,8 @@ signals:   // Signals
     void removeInvalidClip(const QString &, bool replaceProducer);
     void refreshDocumentProducers();
     void blockMonitors();
+    /** Used on OS X - emitted when a frame's image is to be shown. */
+    void showImageSignal(QImage);
 
 public slots:  // Public slots
     /** Start Consumer */
@@ -287,7 +300,7 @@ public slots:  // Public slots
     /** Wraps the VEML command of the same name. Requests the file properties
     for the specified url from the renderer. Upon return, the result will be emitted
     via replyGetFileProperties(). */
-    void getFileProperties(const QDomElement &xml, const QString &clipId, bool replaceProducer = true);
+    void getFileProperties(const QDomElement xml, const QString &clipId, bool replaceProducer = true);
 
     void exportFileToFirewire(QString srcFileName, int port, GenTime startTime, GenTime endTime);
     static char *decodedString(QString str);