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 857d733c42cf90e77ee51bf97aecdecea03d2231..ed67ae8621169fd7852c9bc9bccd5de2aa0797b7 100644 (file)
--- a/glwidget.h
+++ b/glwidget.h
@@ -2,15 +2,16 @@
 #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 {
@@ -29,13 +30,14 @@ class GLWidget : public QGLWidget
 
 public:
        GLWidget(QWidget *parent = 0);
+       ~GLWidget();
 
        void set_output(Mixer::Output output)
        {
                this->output = output;
        }
 
-       void clean_context();
+       void shutdown();
 
 protected:
        void initializeGL() override;
@@ -46,13 +48,21 @@ protected:
 signals:
        void clicked();
        void transition_names_updated(std::vector<std::string> transition_names);
-       void resolution_updated(Mixer::Output output);
+       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;
        GLuint vao, program_num;
        GLuint position_vbo, texcoord_vbo;
        movit::ResourcePool *resource_pool = nullptr;
+       int current_width = 1, current_height = 1;
 };
 
 #endif