Rename “name” to “display name”.

[nageru] / glwidget.h

diff --git a/glwidget.h b/glwidget.h
index 2cf34eb0a50364f3dc523e38daacd9db4b5249e8..3eb55dad47550562307546c3c74a7bce2d577c91 100644 (file)
--- a/glwidget.h
+++ b/glwidget.h
@@ -13,6 +13,12 @@
 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).
 //
@@ -23,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;
@@ -39,11 +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;
        GLuint vao, program_num;
        GLuint position_vbo, texcoord_vbo;
+       movit::ResourcePool *resource_pool = nullptr;
 };
 
 #endif