X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=glwidget.h;h=ae4902c12b1f51464981a6a2bd8c55fb78071e5d;hb=2a431ccd32a47fb0f40389cbd7d1a1e9d1902a64;hp=d3972739cff27de4550b462f5cc863617620ff49;hpb=8cbf100e6126c1550a6436970d777a652ac1182e;p=nageru diff --git a/glwidget.h b/glwidget.h index d397273..ae4902c 100644 --- a/glwidget.h +++ b/glwidget.h @@ -3,15 +3,16 @@ #include #include +#include +#include #include "mixer.h" +#include "qgl.h" +#include "qobjectdefs.h" +class QMouseEvent; class QWidget; -namespace movit { -class ResourcePool; -} - // Note: We use the older QGLWidget instead of QOpenGLWidget as it is // much faster (does not go through a separate offscreen rendering step). // @@ -37,10 +38,11 @@ protected: signals: void clicked(); + void transition_names_updated(std::vector transition_names); + void resolution_updated(Mixer::Output output); private: Mixer::Output output; - movit::ResourcePool *resource_pool; GLuint vao, program_num; GLuint position_vbo, texcoord_vbo; };