Also show the frame rate.

[nageru] / glwidget.cpp

diff --git a/glwidget.cpp b/glwidget.cpp
index a309240e342dd45488d19ba959fb66c0701b205b..06675f346c85211030d0712097aa0db138b1fef6 100644 (file)
--- a/glwidget.cpp
+++ b/glwidget.cpp
@@ -10,7 +10,6 @@
 
 #include "glwidget.h"
 
-#include <movit/resource_pool.h>
 #include <stdio.h>
 #include <functional>
 #include <mutex>
@@ -33,8 +32,7 @@ class QWidget;
 using namespace std;
 
 GLWidget::GLWidget(QWidget *parent)
-    : QGLWidget(parent, global_share_widget),
-      resource_pool(new movit::ResourcePool)
+    : QGLWidget(parent, global_share_widget)
 {
 }
 
@@ -44,9 +42,6 @@ GLWidget::~GLWidget()
 
 void GLWidget::initializeGL()
 {
-       printf("egl context=%p\n", eglGetCurrentContext());
-       //printf("threads: %p %p\n", QThread::currentThread(), qGuiApp->thread());
-
        static std::once_flag flag;
        std::call_once(flag, [this]{
                global_mixer = new Mixer(QGLFormat::toSurfaceFormat(format()), global_flags.num_cards);
@@ -56,6 +51,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());
+               emit resolution_updated(output);
        });
 
        glDisable(GL_BLEND);