Wire the transition names through to the UI.

[nageru] / glwidget.cpp

diff --git a/glwidget.cpp b/glwidget.cpp
index 1e34a1cb3290b6cd84099597a50ae53f8a4fa0bd..3482a13391609c049869650d7aadb32481cb94ec 100644 (file)
--- a/glwidget.cpp
+++ b/glwidget.cpp
@@ -8,6 +8,7 @@
 #include <QSurfaceFormat>
 
 #include "glwidget.h"
+#include "mainwindow.h"
 
 #include <movit/resource_pool.h>
 #include <stdio.h>
@@ -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 <movit/util.h>
 #include <string>
 
+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);