X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=glwidget.h;h=f2eaea8bc00aa0cd95fa40eafa54cdc6edfa67ed;hb=02f65224836f4e7ccecfb89ccd8dc38ee32f319a;hp=a4b54adffecb7374c7b7a36d12a0e63f100102f8;hpb=f006b5b162841dbc764fb620025b87a3272ac79a;p=nageru diff --git a/glwidget.h b/glwidget.h index a4b54ad..f2eaea8 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 { @@ -46,8 +47,8 @@ protected: signals: void clicked(); void transition_names_updated(std::vector transition_names); - void resolution_updated(Mixer::Output output); - void color_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(unsigned signal_num, const QPoint &pos);