Remove an (easily-predictable) branch from the StereoCompressor inner loop.

[nageru] / mainwindow.cpp

diff --git a/mainwindow.cpp b/mainwindow.cpp
index ac59305302c60ff84650d7ab294564878da8bae1..09dcaba1cc5e53e1f26ac49fa3d03ea3e14fa7ad 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));
@@ -368,6 +368,13 @@ void MainWindow::setup_audio_expanded_view()
                });
 
                slave_fader(audio_miniviews[bus_index]->fader, ui_audio_expanded_view->fader);
+
+               // 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);
        }
 }
 
@@ -448,6 +455,11 @@ void MainWindow::cutoff_knob_changed(int value)
        snprintf(buf, sizeof(buf), "%ld Hz", lrintf(cutoff_hz));
        ui->locut_cutoff_display->setText(buf);
        ui->locut_cutoff_display_2->setText(buf);
+
+       for (unsigned bus_index = 0; bus_index < audio_expanded_views.size(); ++bus_index) {
+               audio_expanded_views[bus_index]->locut_enabled->setText(
+                       QString("Lo-cut: ") + buf);
+       }
 }
 
 void MainWindow::report_disk_space(off_t free_bytes, double estimated_seconds_left)
@@ -523,10 +535,10 @@ 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();
@@ -541,19 +553,20 @@ 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];
+                               audio_miniviews[bus_index]->vu_meter_meter->set_level(level.loudness_lufs);
 
                                Ui::AudioExpandedView *view = audio_expanded_views[bus_index];
-                               view->vu_meter_meter->set_level(bus_level_lufs[bus_index]);
+                               view->vu_meter_meter->set_level(level.loudness_lufs);
+                               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);
@@ -568,10 +581,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));