Show the current resolution next to the inputs.

[nageru] / glwidget.cpp

diff --git a/glwidget.cpp b/glwidget.cpp
index 2118ffe1c6dff368cc9b30604cead5b8af8bf7d0..06675f346c85211030d0712097aa0db138b1fef6 100644 (file)
--- a/glwidget.cpp
+++ b/glwidget.cpp
@@ -9,19 +9,20 @@
 #include <QSurfaceFormat>
 
 #include "glwidget.h"
-#include "mainwindow.h"
 
-#include <movit/resource_pool.h>
 #include <stdio.h>
+#include <functional>
 #include <mutex>
 
 #include "context.h"
+#include "effect_chain.h"
+#include "flags.h"
+#include "mainwindow.h"
 #include "mixer.h"
+#include "qnamespace.h"
 #include "ref_counted_gl_sync.h"
-#include "vumeter.h"
 
-class MainWindow;
-class QSurface;
+class QMouseEvent;
 class QWidget;
 
 #undef Success
@@ -31,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)
 {
 }
 
@@ -42,20 +42,16 @@ 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_mixer->set_audio_level_callback([this](float level){
-                       global_vu_meter->set_level(level);
-               });
+               global_mixer = new Mixer(QGLFormat::toSurfaceFormat(format()), global_flags.num_cards);
+               global_mainwindow->mixer_created(global_mixer);
                global_mixer->start();
        });
        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);
@@ -73,12 +69,17 @@ void GLWidget::paintGL()
        Mixer::DisplayFrame frame;
        if (!global_mixer->get_display_frame(output, &frame)) {
                glClearColor(0.0f, 1.0f, 0.0f, 1.0f);
+               check_error();
                glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+               check_error();
                return;
        }
 
+       check_error();
        glWaitSync(frame.ready_fence.get(), /*flags=*/0, GL_TIMEOUT_IGNORED);
+       check_error();
        frame.setup_chain();
+       check_error();
        frame.chain->render_to_screen();
        check_error();
 }