X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=glwidget.h;h=ed67ae8621169fd7852c9bc9bccd5de2aa0797b7;hb=fa54f2630c56a1df0046923d6a77b1bd58abf240;hp=9095e4894f2a11e062b2a1453b89a50f22c80a50;hpb=27c3b5de2b2e8aa292344c7ee36d8eb3e1f67921;p=nageru diff --git a/glwidget.h b/glwidget.h index 9095e48..ed67ae8 100644 --- a/glwidget.h +++ b/glwidget.h @@ -30,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; @@ -51,14 +52,17 @@ signals: 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); -private: 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