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

diff --git a/glwidget.h b/glwidget.h
index 25a8ad7..d71f3c8 100644
--- a/glwidget.h
+++ b/glwidget.h
@@ -2,20 +2,23 @@
 #define GLWIDGET_H
 
 #include <epoxy/gl.h>
-#include <QGLWidget>
+#include <QGL>
+#include <QString>
 #include <string>
 #include <vector>
 
 #include "mixer.h"
-#include "qgl.h"
-#include "qobjectdefs.h"
 
 class QMouseEvent;
+class QObject;
+class QPoint;
 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).
@@ -34,6 +37,8 @@ public:
 		this->output = output;
 	}
 
+	void shutdown();
+
 protected:
 	void initializeGL() override;
 	void resizeGL(int width, int height) override;
@@ -43,12 +48,20 @@ 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(const QPoint &pos);
 
 private:
+	void show_live_context_menu(const QPoint &pos);
+	void show_preview_context_menu(unsigned signal_num, const QPoint &pos);
+
 	Mixer::Output output;
-	movit::ResourcePool *resource_pool;
 	GLuint vao, program_num;
 	GLuint position_vbo, texcoord_vbo;
+	movit::ResourcePool *resource_pool = nullptr;
 };
 
 #endif