Various changes for getting an OpenGL context (almost) everywhere it is needed.

[kdenlive] / src / renderer.h

diff --git a/src/renderer.h b/src/renderer.h
index e6548d76d5f0072fe89d81b8e4d83fdad0c36d9f..96e23dce9f03ef61c5927832d5d4c585cdbf24c4 100644 (file)
--- a/src/renderer.h
+++ b/src/renderer.h
@@ -31,7 +31,7 @@
 
 #include "gentime.h"
 #include "definitions.h"
-#include "abstractmonitor.h"
+#include "widgets/abstractmonitor.h"
 
 #include <mlt/framework/mlt_types.h>
 
@@ -47,6 +47,7 @@
 #include <QSemaphore>
 #include <QTimer>
 
+class QGLWidget;
 class QPixmap;
 
 class KComboBox;
@@ -109,7 +110,7 @@ class Render: public AbstractRender
      *  @param rendererName A unique identifier for this renderer
      *  @param winid The parent widget identifier (required for SDL display). Set to 0 for OpenGL rendering
      *  @param profile The MLT profile used for the renderer (default one will be used if empty). */
-    Render(Kdenlive::MONITORID rendererName, int winid, QString profile = QString(), QWidget *parent = 0);
+    Render(Kdenlive::MonitorId rendererName, int winid, QString profile = QString(), QWidget *parent = 0, QGLWidget *mainGLContext = 0);
 
     /** @brief Destroy the MLT Renderer. */
     virtual ~Render();
@@ -363,7 +364,7 @@ private:
      *
      * Useful to identify the renderers by what they do - e.g. background
      * rendering, workspace monitor, etc. */
-    Kdenlive::MONITORID m_name;
+    Kdenlive::MonitorId m_name;
     Mlt::Consumer * m_mltConsumer;
     Mlt::Producer * m_mltProducer;
     Mlt::Profile *m_mltProfile;
@@ -399,6 +400,9 @@ private:
     bool m_paused;
     /** @brief True if this monitor is active. */
     bool m_isActive;
+    QGLWidget *m_mainGLContext;
+    QGLWidget *m_GLContext;
+    Mlt::Filter* m_glslManager;
 
     void closeMlt();
     void mltCheckLength(Mlt::Tractor *tractor);
@@ -477,11 +481,12 @@ signals:
      *
      * Used in Mac OS X. */
     void showImageSignal(QImage);
+    void showImageSignal(GLuint);
     void showAudioSignal(const QVector<double> &);
     void addClip(const KUrl &, stringMap);
     void checkSeeking();
     /** @brief Activate current monitor. */
-    void activateMonitor(Kdenlive::MONITORID);
+    void activateMonitor(Kdenlive::MonitorId);
     void mltFrameReceived(Mlt::Frame *);
 
 public slots: