X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=glwidget.h;h=ed67ae8621169fd7852c9bc9bccd5de2aa0797b7;hb=b9feb66845bf24465b7671ac9ff7a52b88f6032b;hp=3eb55dad47550562307546c3c74a7bce2d577c91;hpb=7dec19543c858de7247f64f6c82f613f9fe05825;p=nageru diff --git a/glwidget.h b/glwidget.h index 3eb55da..ed67ae8 100644 --- a/glwidget.h +++ b/glwidget.h @@ -2,15 +2,16 @@ #define GLWIDGET_H #include -#include +#include +#include #include #include #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; @@ -50,13 +52,17 @@ signals: void color_updated(Mixer::Output output, const std::string &color); private slots: - void show_context_menu(unsigned signal_num, const QPoint &pos); + 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