X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=glwidget.h;h=857d733c42cf90e77ee51bf97aecdecea03d2231;hb=a1f1d6374a7c519c7a8b412578c9b88d64edddd4;hp=0d74480802ef37224707f53a1b2906591ee43209;hpb=dcb31f8b7e319abe6c75a77c1f7a9a392c164f7e;p=nageru

diff --git a/glwidget.h b/glwidget.h
index 0d74480..857d733 100644
--- a/glwidget.h
+++ b/glwidget.h
@@ -1,28 +1,58 @@
 #ifndef GLWIDGET_H
 #define GLWIDGET_H
 
-#include <QOpenGLWidget>
+#include <epoxy/gl.h>
+#include <QGLWidget>
+#include <string>
+#include <vector>
+
+#include "mixer.h"
+#include "qgl.h"
+#include "qobjectdefs.h"
+
+class QMouseEvent;
+class QWidget;
 
 namespace movit {
+
 class ResourcePool;
-}
 
-class GLWidget : public QOpenGLWidget
+}  // namespace movit
+
+// 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
 
 public:
 	GLWidget(QWidget *parent = 0);
-	~GLWidget();
+
+	void set_output(Mixer::Output output)
+	{
+		this->output = output;
+	}
+
+	void clean_context();
 
 protected:
 	void initializeGL() override;
+	void resizeGL(int width, int height) override;
 	void paintGL() override;
+	void mousePressEvent(QMouseEvent *event) override;
+
+signals:
+	void clicked();
+	void transition_names_updated(std::vector<std::string> transition_names);
+	void resolution_updated(Mixer::Output output);
 
 private:
-	movit::ResourcePool *resource_pool;
+	Mixer::Output output;
 	GLuint vao, program_num;
-
+	GLuint position_vbo, texcoord_vbo;
+	movit::ResourcePool *resource_pool = nullptr;
 };
 
 #endif