Hook up the EQ controls and labels.

[nageru] / mainwindow.cpp

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 923c4f9f199c45eabfbf05a50c70772e6013db15..ea742f701dc40cef3c37685c670cb8e046b59194 100644 (file)
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -127,6 +127,19 @@ string format_db(double db, unsigned flags)
        return text;
 }
 
+void set_peak_label(QLabel *peak_label, float peak_db)
+{
+       peak_label->setText(QString::fromStdString(format_db(peak_db, DB_BARE)));
+
+       // -0.1 dBFS is EBU peak limit. We use it consistently, even for the bus meters
+       // (which don't calculate interpolate peak, and in general don't follow EBU recommendations).
+       if (peak_db > -0.1f) {
+               peak_label->setStyleSheet("QLabel { background-color: red; color: white; }");
+       } else {
+               peak_label->setStyleSheet("");
+       }
+}
+
 }  // namespace
 
 MainWindow::MainWindow()
@@ -330,6 +343,10 @@ void MainWindow::setup_audio_miniview()
 
                connect(ui_audio_miniview->fader, &NonLinearFader::dbValueChanged,
                        bind(&MainWindow::mini_fader_changed, this, bus_index, _1));
+               connect(ui_audio_miniview->peak_display_label, &ClickableLabel::clicked,
+                       [bus_index]() {
+                               global_mixer->get_audio_mixer()->reset_peak(bus_index);
+                       });
        }
 }
 
@@ -352,6 +369,9 @@ void MainWindow::setup_audio_expanded_view()
                ui_audio_expanded_view->bus_desc_label->setFullText(
                        QString::fromStdString(mapping.buses[bus_index].name));
                audio_expanded_views[bus_index] = ui_audio_expanded_view;
+               update_eq_label(bus_index, EQ_BAND_TREBLE, global_mixer->get_audio_mixer()->get_eq(bus_index, EQ_BAND_TREBLE));
+               update_eq_label(bus_index, EQ_BAND_MID, global_mixer->get_audio_mixer()->get_eq(bus_index, EQ_BAND_MID));
+               update_eq_label(bus_index, EQ_BAND_BASS, global_mixer->get_audio_mixer()->get_eq(bus_index, EQ_BAND_BASS));
                // TODO: Set the fader position.
                ui->buses->addWidget(channel);
 
@@ -360,6 +380,13 @@ void MainWindow::setup_audio_expanded_view()
                        global_mixer->get_audio_mixer()->set_locut_enabled(bus_index, state == Qt::Checked);
                });
 
+               connect(ui_audio_expanded_view->treble_knob, &QDial::valueChanged,
+                       bind(&MainWindow::eq_knob_changed, this, bus_index, EQ_BAND_TREBLE, _1));
+               connect(ui_audio_expanded_view->mid_knob, &QDial::valueChanged,
+                       bind(&MainWindow::eq_knob_changed, this, bus_index, EQ_BAND_MID, _1));
+               connect(ui_audio_expanded_view->bass_knob, &QDial::valueChanged,
+                       bind(&MainWindow::eq_knob_changed, this, bus_index, EQ_BAND_BASS, _1));
+
                ui_audio_expanded_view->gainstaging_knob->setValue(global_mixer->get_audio_mixer()->get_gain_staging_db(bus_index));
                ui_audio_expanded_view->gainstaging_auto_checkbox->setChecked(global_mixer->get_audio_mixer()->get_gain_staging_auto(bus_index));
                ui_audio_expanded_view->compressor_enabled->setChecked(global_mixer->get_audio_mixer()->get_compressor_enabled(bus_index));
@@ -382,6 +409,11 @@ void MainWindow::setup_audio_expanded_view()
                peak_meter->set_max_level(0.0f);
                peak_meter->set_ref_level(0.0f);
 
+               connect(ui_audio_expanded_view->peak_display_label, &ClickableLabel::clicked,
+                       [bus_index]() {
+                               global_mixer->get_audio_mixer()->reset_peak(bus_index);
+                       });
+
                // Set up the compression attenuation meter.
                VUMeter *reduction_meter = ui_audio_expanded_view->reduction_meter;
                reduction_meter->set_min_level(0.0f);
@@ -508,6 +540,33 @@ void MainWindow::report_disk_space(off_t free_bytes, double estimated_seconds_le
        });
 }
 
+void MainWindow::eq_knob_changed(unsigned bus_index, EQBand band, int value)
+{
+       float gain_db = value * 0.1f;
+       global_mixer->get_audio_mixer()->set_eq(bus_index, band, gain_db);
+
+       update_eq_label(bus_index, band, gain_db);
+}
+
+void MainWindow::update_eq_label(unsigned bus_index, EQBand band, float gain_db)
+{
+       Ui::AudioExpandedView *view = audio_expanded_views[bus_index];
+       string db_string = format_db(gain_db, DB_WITH_SIGN);
+       switch (band) {
+       case EQ_BAND_TREBLE:
+               view->treble_label->setText(QString::fromStdString("Treble: " + db_string));
+               break;
+       case EQ_BAND_MID:
+               view->mid_label->setText(QString::fromStdString("Mid: " + db_string));
+               break;
+       case EQ_BAND_BASS:
+               view->bass_label->setText(QString::fromStdString("Bass: " + db_string));
+               break;
+       default:
+               assert(false);
+       }
+}
+
 void MainWindow::limiter_threshold_knob_changed(int value)
 {
        float threshold_dbfs = value * 0.1f;
@@ -579,6 +638,7 @@ void MainWindow::audio_level_callback(float level_lufs, float peak_db, vector<Au
                                        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]);
+                               set_peak_label(miniview->peak_display_label, level.historic_peak_dbfs);
 
                                Ui::AudioExpandedView *view = audio_expanded_views[bus_index];
                                view->peak_meter->set_level(
@@ -592,17 +652,14 @@ void MainWindow::audio_level_callback(float level_lufs, float peak_db, vector<Au
                                view->gainstaging_db_display->setText(
                                        QString("Gain: ") +
                                        QString::fromStdString(format_db(level.gain_staging_db, DB_WITH_SIGN)));
+                               set_peak_label(view->peak_display_label, level.historic_peak_dbfs);
                        }
                }
                ui->lra_meter->set_levels(global_level_lufs, range_low_lufs, range_high_lufs);
                ui->correlation_meter->set_correlation(correlation);
 
                ui->peak_display->setText(QString::fromStdString(format_db(peak_db, DB_BARE)));
-               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("");
-               }
+               set_peak_label(ui->peak_display, peak_db);
 
                // NOTE: Will be invisible when using multitrack audio.
                ui->gainstaging_knob->blockSignals(true);