X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=glwidget.h;h=ed67ae8621169fd7852c9bc9bccd5de2aa0797b7;hb=4a0187ffb4075b4d217b8d9e9c96cac548b199d8;hp=12757fc5bcbc97dbef4535657fa450ef4881b531;hpb=12fc672ab7cb2cd7d2bbad10d1a038395a75941e;p=nageru diff --git a/glwidget.h b/glwidget.h index 12757fc..ed67ae8 100644 --- a/glwidget.h +++ b/glwidget.h @@ -37,7 +37,7 @@ public: this->output = output; } - void clean_context(); + void shutdown(); protected: void initializeGL() override; @@ -52,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