X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=glwidget.cpp;h=3482a13391609c049869650d7aadb32481cb94ec;hb=92d7d0f49eca3378714670843f244a8d7ae8b05d;hp=1e34a1cb3290b6cd84099597a50ae53f8a4fa0bd;hpb=2a7cf4b5d75c7c6f5c6cc4df1ab80978f2f94d9c;p=nageru diff --git a/glwidget.cpp b/glwidget.cpp index 1e34a1c..3482a13 100644 --- a/glwidget.cpp +++ b/glwidget.cpp @@ -8,6 +8,7 @@ #include #include "glwidget.h" +#include "mainwindow.h" #include #include @@ -17,6 +18,7 @@ #include "mixer.h" #include "ref_counted_gl_sync.h" +class MainWindow; class QSurface; class QWidget; @@ -24,6 +26,8 @@ class QWidget; #include #include +using namespace std; + GLWidget::GLWidget(QWidget *parent) : QGLWidget(parent, global_share_widget), resource_pool(new movit::ResourcePool) @@ -46,6 +50,7 @@ void GLWidget::initializeGL() }); global_mixer->set_frame_ready_callback(output, [this]{ QMetaObject::invokeMethod(this, "update", Qt::AutoConnection); + emit transition_names_updated(global_mixer->get_transition_names()); }); glDisable(GL_BLEND);