X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=glwidget.cpp;h=daadaf2f8d0e222efca7403e60226e20e86bfa46;hb=77717b38c14df84b13146506da891ced604c53a2;hp=075106aa695b2d582aab561a1faba58ff5b36247;hpb=8d0d68b7cca3a4c58268fa0822ca38bb1863dd19;p=nageru diff --git a/glwidget.cpp b/glwidget.cpp index 075106a..daadaf2 100644 --- a/glwidget.cpp +++ b/glwidget.cpp @@ -48,13 +48,7 @@ void GLWidget::initializeGL() 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_lufs, float peak_db){ - global_vu_meter->set_level(level_lufs); - - char buf[256]; - snprintf(buf, sizeof(buf), "%.1f", peak_db); - global_peak_display->setText(buf); - }); + global_mainwindow->mixer_created(global_mixer); global_mixer->start(); }); global_mixer->set_frame_ready_callback(output, [this]{ @@ -77,12 +71,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(); }