X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=glwidget.h;h=857d733c42cf90e77ee51bf97aecdecea03d2231;hb=607f05fc1c946bae0e436c2e551e07364a49ebcf;hp=d3972739cff27de4550b462f5cc863617620ff49;hpb=8cbf100e6126c1550a6436970d777a652ac1182e;p=nageru

diff --git a/glwidget.h b/glwidget.h
index d397273..857d733 100644
--- a/glwidget.h
+++ b/glwidget.h
@@ -3,14 +3,21 @@
 
 #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;
-}
+
+}  // 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).
@@ -22,13 +29,14 @@ class GLWidget : public QGLWidget
 
 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;
@@ -37,12 +45,14 @@ protected:
 
 signals:
 	void clicked();
+	void transition_names_updated(std::vector<std::string> transition_names);
+	void resolution_updated(Mixer::Output output);
 
 private:
 	Mixer::Output output;
-	movit::ResourcePool *resource_pool;
 	GLuint vao, program_num;
 	GLuint position_vbo, texcoord_vbo;
+	movit::ResourcePool *resource_pool = nullptr;
 };
 
 #endif