Refcount the input frames directly instead of trying to free them after-the-fact...

[nageru] / glwidget.h

diff --git a/glwidget.h b/glwidget.h
index 0d74480802ef37224707f53a1b2906591ee43209..045ba5587204ea7ebb7351e2aad323dc79e0fb91 100644 (file)
--- a/glwidget.h
+++ b/glwidget.h
@@ -1,13 +1,22 @@
 #ifndef GLWIDGET_H
 #define GLWIDGET_H
 
-#include <QOpenGLWidget>
+#include <epoxy/gl.h>
+#include <QGLWidget>
+
+#include "mixer.h"
+
+class QWidget;
 
 namespace movit {
 class ResourcePool;
 }
 
-class GLWidget : public QOpenGLWidget
+// Note: We use the older QGLWidget instead of QOpenGLWidget as it is
+// much faster (does not go through a separate offscreen rendering step).
+//
+// TODO: Consider if QOpenGLWindow could do what we want.
+class GLWidget : public QGLWidget
 {
        Q_OBJECT
 
@@ -15,14 +24,21 @@ public:
        GLWidget(QWidget *parent = 0);
        ~GLWidget();
 
+       void set_output(Mixer::Output output)
+       {
+               this->output = output;
+       }
+
 protected:
        void initializeGL() override;
+       void resizeGL(int width, int height) override;
        void paintGL() override;
 
 private:
+       Mixer::Output output;
        movit::ResourcePool *resource_pool;
        GLuint vao, program_num;
-
+       GLuint position_vbo, texcoord_vbo;
 };
 
 #endif