From 635bc53e064f4cd96d4271a8a28b59b301d5921d Mon Sep 17 00:00:00 2001 From: "Steinar H. Gunderson" Date: Sun, 8 Nov 2015 22:38:28 +0100 Subject: [PATCH] Move some lambdas in MainWindow out into real functions. --- mainwindow.cpp | 62 +++++++++++++++++++++++++++----------------------- mainwindow.h | 4 ++++ 2 files changed, 38 insertions(+), 28 deletions(-) diff --git a/mainwindow.cpp b/mainwindow.cpp index 265c7ec..7ec6f0c 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -26,6 +26,7 @@ class QResizeEvent; using namespace std; +using namespace std::placeholders; Q_DECLARE_METATYPE(std::vector); @@ -80,45 +81,50 @@ void MainWindow::mixer_created(Mixer *mixer) previews.push_back(ui_display); // Hook up the click. - connect(ui_display->display, &GLWidget::clicked, std::bind(&MainWindow::channel_clicked, this, i)); + connect(ui_display->display, &GLWidget::clicked, bind(&MainWindow::channel_clicked, this, i)); // Hook up the keyboard key. QShortcut *shortcut = new QShortcut(QKeySequence(Qt::Key_1 + i), this); - connect(shortcut, &QShortcut::activated, std::bind(&MainWindow::channel_clicked, this, i)); + connect(shortcut, &QShortcut::activated, bind(&MainWindow::channel_clicked, this, i)); // Hook up the white balance button (irrelevant if invisible). ui_display->wb_button->setVisible(mixer->get_supports_set_wb(output)); - connect(ui_display->wb_button, &QPushButton::clicked, std::bind(&MainWindow::wb_button_clicked, this, i)); + connect(ui_display->wb_button, &QPushButton::clicked, bind(&MainWindow::wb_button_clicked, this, i)); } - connect(ui->locut_cutoff_knob, &QDial::valueChanged, [this](int value) { - float octaves = value * 0.1f; - float cutoff_hz = 20.0 * pow(2.0, octaves); - global_mixer->set_locut_cutoff(cutoff_hz); + connect(ui->locut_cutoff_knob, &QDial::valueChanged, this, &MainWindow::cutoff_knob_changed); + mixer->set_audio_level_callback(bind(&MainWindow::audio_level_callback, this, _1, _2, _3, _4, _5, _6)); +} + +void MainWindow::cutoff_knob_changed(int value) +{ + float octaves = value * 0.1f; + float cutoff_hz = 20.0 * pow(2.0, octaves); + global_mixer->set_locut_cutoff(cutoff_hz); + + char buf[256]; + snprintf(buf, sizeof(buf), "%ld Hz", lrintf(cutoff_hz)); + ui->locut_cutoff_display->setText(buf); +} + +void MainWindow::audio_level_callback(float level_lufs, float peak_db, float global_level_lufs, float range_low_lufs, float range_high_lufs, float auto_gain_staging_db) +{ + post_to_main_thread([=]() { + ui->vu_meter->set_level(level_lufs); + ui->lra_meter->set_levels(global_level_lufs, range_low_lufs, range_high_lufs); char buf[256]; - snprintf(buf, sizeof(buf), "%ld Hz", lrintf(cutoff_hz)); - ui->locut_cutoff_display->setText(buf); - }); + snprintf(buf, sizeof(buf), "%.1f", peak_db); + ui->peak_display->setText(buf); + if (peak_db > -0.1f) { // -0.1 dBFS is EBU peak limit. + ui->peak_display->setStyleSheet("QLabel { background-color: red; color: white; }"); + } else { + ui->peak_display->setStyleSheet(""); + } - mixer->set_audio_level_callback([this](float level_lufs, float peak_db, float global_level_lufs, float range_low_lufs, float range_high_lufs, float auto_gain_staging_db){ - post_to_main_thread([=]() { - ui->vu_meter->set_level(level_lufs); - ui->lra_meter->set_levels(global_level_lufs, range_low_lufs, range_high_lufs); - - char buf[256]; - snprintf(buf, sizeof(buf), "%.1f", peak_db); - ui->peak_display->setText(buf); - if (peak_db > -0.1f) { // -0.1 dBFS is EBU peak limit. - ui->peak_display->setStyleSheet("QLabel { background-color: red; color: white; }"); - } else { - ui->peak_display->setStyleSheet(""); - } - - ui->gainstaging_knob->setValue(lrintf(auto_gain_staging_db * 10.0f)); - snprintf(buf, sizeof(buf), "%+.1f dB", auto_gain_staging_db); - ui->gainstaging_db_display->setText(buf); - }); + ui->gainstaging_knob->setValue(lrintf(auto_gain_staging_db * 10.0f)); + snprintf(buf, sizeof(buf), "%+.1f dB", auto_gain_staging_db); + ui->gainstaging_db_display->setText(buf); }); } diff --git a/mainwindow.h b/mainwindow.h index 28c4705..317d292 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -30,12 +30,16 @@ public slots: void channel_clicked(int channel_number); void wb_button_clicked(int channel_number); void set_transition_names(std::vector transition_names); + void cutoff_knob_changed(int value); void relayout(); private: bool eventFilter(QObject *watched, QEvent *event) override; void set_white_balance(int channel_number, int x, int y); + // Called from the mixer. + void audio_level_callback(float level_lufs, float peak_db, float global_level_lufs, float range_low_lufs, float range_high_lufs, float auto_gain_staging_db); + Ui::MainWindow *ui; QPushButton *transition_btn1, *transition_btn2, *transition_btn3; std::vector previews; -- 2.39.2