X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=glwidget.h;h=3eb55dad47550562307546c3c74a7bce2d577c91;hb=2da661c06c945b2fb3521bbabcc7e81d63dabdd7;hp=25a8ad7b7a7b99483dd59e5799a17c7b80ea4102;hpb=d7bba4abb3d56893399578f0540b9ded0a28380f;p=nageru

diff --git a/glwidget.h b/glwidget.h
index 25a8ad7..3eb55da 100644
--- a/glwidget.h
+++ b/glwidget.h
@@ -14,8 +14,10 @@ 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).
@@ -27,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;
@@ -43,12 +46,17 @@ protected:
 signals:
 	void clicked();
 	void transition_names_updated(std::vector<std::string> transition_names);
+	void name_updated(Mixer::Output output, const std::string &name);
+	void color_updated(Mixer::Output output, const std::string &color);
+
+private slots:
+	void show_context_menu(unsigned signal_num, const QPoint &pos);
 
 private:
 	Mixer::Output output;
-	movit::ResourcePool *resource_pool;
 	GLuint vao, program_num;
 	GLuint position_vbo, texcoord_vbo;
+	movit::ResourcePool *resource_pool = nullptr;
 };
 
 #endif