Make NUM_CARDS into a command-line flag.

[nageru] / glwidget.cpp

diff --git a/glwidget.cpp b/glwidget.cpp
index 3cd63585633d8bb314376d6600f1de435f82d6b3..da5be6f88221373eedaddf8860291a2ad95f5ab2 100644 (file)
--- a/glwidget.cpp
+++ b/glwidget.cpp
@@ -16,6 +16,7 @@
 #include <mutex>
 
 #include "context.h"
+#include "flags.h"
 #include "mixer.h"
 #include "ref_counted_gl_sync.h"
 #include "vumeter.h"
@@ -47,7 +48,7 @@ void GLWidget::initializeGL()
 
        static std::once_flag flag;
        std::call_once(flag, [this]{
-               global_mixer = new Mixer(QGLFormat::toSurfaceFormat(format()));
+               global_mixer = new Mixer(QGLFormat::toSurfaceFormat(format()), global_flags.num_cards);
                global_mainwindow->mixer_created(global_mixer);
                global_mixer->start();
        });
@@ -71,12 +72,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();
 }