Make signal mapping changeable by right-clicking on the preview.

[nageru] / mainwindow.cpp

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 311e573272de89d97f36173af23fca1dd5f81de0..5cd698e39cc65346ea06321da3ebe1cdfb56d827 100644 (file)
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -110,6 +110,9 @@ void MainWindow::mixer_created(Mixer *mixer)
 
        connect(ui->locut_cutoff_knob, &QDial::valueChanged, this, &MainWindow::cutoff_knob_changed);
        cutoff_knob_changed(ui->locut_cutoff_knob->value());
+       connect(ui->locut_enabled, &QCheckBox::stateChanged, [this](int state){
+               global_mixer->set_locut_enabled(state == Qt::Checked);
+       });
 
        // Not QDial::valueChanged, as we call setValue() all the time.
        connect(ui->gainstaging_knob, &QAbstractSlider::sliderMoved, this, &MainWindow::gain_staging_knob_changed);
@@ -130,7 +133,7 @@ void MainWindow::mixer_created(Mixer *mixer)
                global_mixer->set_compressor_enabled(state == Qt::Checked);
        });
        connect(ui->reset_meters_button, &QPushButton::clicked, this, &MainWindow::reset_meters_button_clicked);
-       mixer->set_audio_level_callback(bind(&MainWindow::audio_level_callback, this, _1, _2, _3, _4, _5, _6, _7));
+       mixer->set_audio_level_callback(bind(&MainWindow::audio_level_callback, this, _1, _2, _3, _4, _5, _6, _7, _8));
 }
 
 void MainWindow::mixer_shutting_down()
@@ -215,7 +218,10 @@ void MainWindow::reset_meters_button_clicked()
        ui->peak_display->setStyleSheet("");
 }
 
-void MainWindow::audio_level_callback(float level_lufs, float peak_db, float global_level_lufs, float range_low_lufs, float range_high_lufs, float gain_staging_db, float final_makeup_gain_db)
+void MainWindow::audio_level_callback(float level_lufs, float peak_db, float global_level_lufs,
+                                      float range_low_lufs, float range_high_lufs,
+                                      float gain_staging_db, float final_makeup_gain_db,
+                                      float correlation)
 {
        timeval now;
        gettimeofday(&now, nullptr);
@@ -232,6 +238,7 @@ void MainWindow::audio_level_callback(float level_lufs, float peak_db, float glo
        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);
+               ui->correlation_meter->set_correlation(correlation);
 
                char buf[256];
                snprintf(buf, sizeof(buf), "%.1f", peak_db);
@@ -273,8 +280,9 @@ void MainWindow::relayout()
        remaining_height -= audiostrip_height + ui->vertical_layout->spacing();
 
        // The previews will be constrained by the remaining height, and the width.
-       double preview_label_height = previews[0]->title_bar->geometry().height() + ui->preview_displays->spacing();  // Wrong spacing?
-       int preview_total_width = ui->preview_displays->geometry().width();
+       double preview_label_height = previews[0]->title_bar->geometry().height() +
+               previews[0]->main_vertical_layout->spacing();
+       int preview_total_width = ui->preview_displays->geometry().width() - (previews.size() - 1) * ui->preview_displays->spacing();
        double preview_height = min(remaining_height - preview_label_height, (preview_total_width / double(previews.size())) * 9.0 / 16.0);
        remaining_height -= preview_height + preview_label_height + ui->vertical_layout->spacing();
 
@@ -285,14 +293,12 @@ void MainWindow::relayout()
 
        // Set the widths for the previews.
        double preview_width = preview_height * 16.0 / 9.0;
-       double remaining_preview_width = preview_total_width;
-
        for (unsigned i = 0; i < previews.size(); ++i) {
                ui->preview_displays->setStretch(i, lrintf(preview_width));
-               remaining_preview_width -= preview_width + ui->preview_displays->spacing();
        }
 
        // The preview horizontal spacer.
+       double remaining_preview_width = preview_total_width - previews.size() * preview_width;
        ui->preview_displays->setStretch(previews.size(), lrintf(remaining_preview_width));
 }