Replace the R128 meters for each channel with a digital peak meter.

[nageru] / mainwindow.cpp

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 0837cc6afd70d3f47849f7954a6724e6524c6891..923c4f9f199c45eabfbf05a50c70772e6013db15 100644 (file)
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -283,7 +283,7 @@ void MainWindow::mixer_created(Mixer *mixer)
                global_mixer->get_audio_mixer()->set_limiter_enabled(state == Qt::Checked);
        });
        connect(ui->reset_meters_button, &QPushButton::clicked, this, &MainWindow::reset_meters_button_clicked);
-       mixer->get_audio_mixer()->set_audio_level_callback(bind(&MainWindow::audio_level_callback, this, _1, _2, _3, _4, _5, _6, _7, _8, _9));
+       mixer->get_audio_mixer()->set_audio_level_callback(bind(&MainWindow::audio_level_callback, this, _1, _2, _3, _4, _5, _6, _7, _8));
 
        struct sigaction act;
        memset(&act, 0, sizeof(act));
@@ -318,6 +318,13 @@ void MainWindow::setup_audio_miniview()
                ui_audio_miniview->bus_desc_label->setFullText(
                        QString::fromStdString(mapping.buses[bus_index].name));
                audio_miniviews[bus_index] = ui_audio_miniview;
+
+               // Set up the peak meter.
+               VUMeter *peak_meter = ui_audio_miniview->peak_meter;
+               peak_meter->set_min_level(-30.0f);
+               peak_meter->set_max_level(0.0f);
+               peak_meter->set_ref_level(0.0f);
+
                // TODO: Set the fader position.
                ui->faders->addWidget(channel);
 
@@ -368,6 +375,19 @@ void MainWindow::setup_audio_expanded_view()
                });
 
                slave_fader(audio_miniviews[bus_index]->fader, ui_audio_expanded_view->fader);
+
+               // Set up the peak meter.
+               VUMeter *peak_meter = ui_audio_expanded_view->peak_meter;
+               peak_meter->set_min_level(-30.0f);
+               peak_meter->set_max_level(0.0f);
+               peak_meter->set_ref_level(0.0f);
+
+               // Set up the compression attenuation meter.
+               VUMeter *reduction_meter = ui_audio_expanded_view->reduction_meter;
+               reduction_meter->set_min_level(0.0f);
+               reduction_meter->set_max_level(10.0f);
+               reduction_meter->set_ref_level(0.0f);
+               reduction_meter->set_flip(true);
        }
 }
 
@@ -528,16 +548,21 @@ void MainWindow::reset_meters_button_clicked()
        ui->peak_display->setStyleSheet("");
 }
 
-void MainWindow::audio_level_callback(float level_lufs, float peak_db, vector<float> bus_level_lufs,
+void MainWindow::audio_level_callback(float level_lufs, float peak_db, vector<AudioMixer::BusLevel> bus_levels,
                                       float global_level_lufs,
                                       float range_low_lufs, float range_high_lufs,
-                                      vector<float> gain_staging_db, float final_makeup_gain_db,
+                                      float final_makeup_gain_db,
                                       float correlation)
 {
        steady_clock::time_point now = steady_clock::now();
 
        // The meters are somewhat inefficient to update. Only update them
-       // every 100 ms or so (we get updates every 5–20 ms).
+       // every 100 ms or so (we get updates every 5–20 ms). Note that this
+       // means that the digital peak meters are ever so slightly too low
+       // (each update won't be a faithful representation of the highest peak
+       // since the previous update, since there are frames we won't draw),
+       // but the _peak_ of the peak meters will be correct (it's tracked in
+       // AudioMixer, not here), and that's much more important.
        double last_update_age = duration<double>(now - last_audio_level_callback).count();
        if (last_update_age < 0.100) {
                return;
@@ -546,19 +571,27 @@ void MainWindow::audio_level_callback(float level_lufs, float peak_db, vector<fl
 
        post_to_main_thread([=]() {
                ui->vu_meter->set_level(level_lufs);
-               for (unsigned bus_index = 0; bus_index < bus_level_lufs.size(); ++bus_index) {
+               for (unsigned bus_index = 0; bus_index < bus_levels.size(); ++bus_index) {
                        if (bus_index < audio_miniviews.size()) {
-                               audio_miniviews[bus_index]->vu_meter_meter->set_level(
-                                       bus_level_lufs[bus_index]);
+                               const AudioMixer::BusLevel &level = bus_levels[bus_index];
+                               Ui::AudioMiniView *miniview = audio_miniviews[bus_index];
+                               miniview->peak_meter->set_level(
+                                       level.current_level_dbfs[0], level.current_level_dbfs[1]);
+                               miniview->peak_meter->set_peak(
+                                       level.peak_level_dbfs[0], level.peak_level_dbfs[1]);
 
                                Ui::AudioExpandedView *view = audio_expanded_views[bus_index];
-                               view->vu_meter_meter->set_level(bus_level_lufs[bus_index]);
+                               view->peak_meter->set_level(
+                                       level.current_level_dbfs[0], level.current_level_dbfs[1]);
+                               view->peak_meter->set_peak(
+                                       level.peak_level_dbfs[0], level.peak_level_dbfs[1]);
+                               view->reduction_meter->set_level(level.compressor_attenuation_db);
                                view->gainstaging_knob->blockSignals(true);
-                               view->gainstaging_knob->setValue(lrintf(gain_staging_db[bus_index] * 10.0f));
+                               view->gainstaging_knob->setValue(lrintf(level.gain_staging_db * 10.0f));
                                view->gainstaging_knob->blockSignals(false);
                                view->gainstaging_db_display->setText(
                                        QString("Gain: ") +
-                                       QString::fromStdString(format_db(gain_staging_db[bus_index], DB_WITH_SIGN)));
+                                       QString::fromStdString(format_db(level.gain_staging_db, DB_WITH_SIGN)));
                        }
                }
                ui->lra_meter->set_levels(global_level_lufs, range_low_lufs, range_high_lufs);
@@ -573,10 +606,10 @@ void MainWindow::audio_level_callback(float level_lufs, float peak_db, vector<fl
 
                // NOTE: Will be invisible when using multitrack audio.
                ui->gainstaging_knob->blockSignals(true);
-               ui->gainstaging_knob->setValue(lrintf(gain_staging_db[0] * 10.0f));
+               ui->gainstaging_knob->setValue(lrintf(bus_levels[0].gain_staging_db * 10.0f));
                ui->gainstaging_knob->blockSignals(false);
                ui->gainstaging_db_display->setText(
-                       QString::fromStdString(format_db(gain_staging_db[0], DB_WITH_SIGN)));
+                       QString::fromStdString(format_db(bus_levels[0].gain_staging_db, DB_WITH_SIGN)));
 
                ui->makeup_gain_knob->blockSignals(true);
                ui->makeup_gain_knob->setValue(lrintf(final_makeup_gain_db * 10.0f));