Fix an issue where the mixer lagging too much behind CEF would cause us to display...

[nageru] / glwidget.h

diff --git a/glwidget.h b/glwidget.h
index 045ba5587204ea7ebb7351e2aad323dc79e0fb91..ed67ae8621169fd7852c9bc9bccd5de2aa0797b7 100644 (file)
--- a/glwidget.h
+++ b/glwidget.h
@@ -2,15 +2,23 @@
 #define GLWIDGET_H
 
 #include <epoxy/gl.h>
-#include <QGLWidget>
+#include <QGL>
+#include <QString>
+#include <string>
+#include <vector>
 
 #include "mixer.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).
@@ -29,16 +37,32 @@ public:
                this->output = output;
        }
 
+       void shutdown();
+
 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 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;
+       int current_width = 1, current_height = 1;
 };
 
 #endif