Make a non-linear fader for dB use. Not perfect yet, but will do.

[nageru] / mainwindow.cpp

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 23d76ab8a16c0bd101e9d1ee4393525142194efa..3f9873ffa76983866ed9c8c02ce164d6bc075206 100644 (file)
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -177,20 +177,7 @@ void MainWindow::mixer_created(Mixer *mixer)
                connect(ui_display->wb_button, &QPushButton::clicked, bind(&MainWindow::wb_button_clicked, this, i));
        }
 
-       // Audio miniview: Make some channels!
-       for (unsigned i = 0; i < num_previews; ++i) {
-               Mixer::Output output = Mixer::Output(Mixer::OUTPUT_INPUT0 + i);
-
-               QWidget *channel = new QWidget(this);
-               Ui::AudioMiniView *ui_audio_miniview = new Ui::AudioMiniView;
-               ui_audio_miniview->setupUi(channel);
-               ui_audio_miniview->channel_desc_label->setFullText(
-                       QString::fromStdString(mixer->get_channel_name(output)));
-               ui->faders->addWidget(channel);
-
-               connect(ui_audio_miniview->fader, &QAbstractSlider::valueChanged,
-                       bind(&MainWindow::mini_fader_changed, this, ui_audio_miniview, i, _1));
-       }
+       setup_audio_miniview();
 
        // TODO: Fetch all of the values these for completeness,
        // not just the enable knobs implied by flags.
@@ -230,7 +217,7 @@ void MainWindow::mixer_created(Mixer *mixer)
                global_mixer->get_audio_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, _8));
+       mixer->get_audio_mixer()->set_audio_level_callback(bind(&MainWindow::audio_level_callback, this, _1, _2, _3, _4, _5, _6, _7, _8, _9));
 
        struct sigaction act;
        memset(&act, 0, sizeof(act));
@@ -246,6 +233,33 @@ void MainWindow::mixer_created(Mixer *mixer)
        sigaction(SIGUSR1, &act, nullptr);
 }
 
+void MainWindow::setup_audio_miniview()
+{
+       // Remove any existing channels.
+       for (QLayoutItem *item; (item = ui->faders->takeAt(0)) != nullptr; ) {
+               delete item->widget();
+               delete item;
+       }
+       audio_miniviews.clear();
+
+       // Set up brand new ones from the input mapping.
+       InputMapping mapping = global_mixer->get_audio_mixer()->get_input_mapping();
+       audio_miniviews.resize(mapping.buses.size());
+       for (unsigned bus_index = 0; bus_index < mapping.buses.size(); ++bus_index) {
+               QWidget *channel = new QWidget(this);
+               Ui::AudioMiniView *ui_audio_miniview = new Ui::AudioMiniView;
+               ui_audio_miniview->setupUi(channel);
+               ui_audio_miniview->bus_desc_label->setFullText(
+                       QString::fromStdString(mapping.buses[bus_index].name));
+               audio_miniviews[bus_index] = ui_audio_miniview;
+               // TODO: Set the fader position.
+               ui->faders->addWidget(channel);
+
+               connect(ui_audio_miniview->fader, &NonLinearFader::dbValueChanged,
+                       bind(&MainWindow::mini_fader_changed, this, ui_audio_miniview, bus_index, _1));
+       }
+}
+
 void MainWindow::mixer_shutting_down()
 {
        ui->me_live->clean_context();
@@ -282,7 +296,9 @@ void MainWindow::about_triggered()
 
 void MainWindow::input_mapping_triggered()
 {
-       InputMappingDialog().exec();
+       if (InputMappingDialog().exec() == QDialog::Accepted) {
+               setup_audio_miniview();
+       }
 }
 
 void MainWindow::gain_staging_knob_changed(int value)
@@ -365,25 +381,28 @@ void MainWindow::compressor_threshold_knob_changed(int value)
                QString::fromStdString(format_db(threshold_dbfs, DB_WITH_SIGN)));
 }
 
-void MainWindow::mini_fader_changed(Ui::AudioMiniView *ui, int channel, int value)
+void MainWindow::mini_fader_changed(Ui::AudioMiniView *ui, int channel, double volume_db)
 {
-       float volume_db = value * 0.1f;
-
        char buf[256];
-       snprintf(buf, sizeof(buf), "%+.1f dB", volume_db);
-       ui->fader_label->setText(buf);
+       if (isfinite(volume_db)) {
+               snprintf(buf, sizeof(buf), "%+.1f dB", volume_db);
+               ui->fader_label->setText(buf);
+       } else {
+               ui->fader_label->setText("-∞ dB");
+       }
 
        global_mixer->get_audio_mixer()->set_fader_volume(channel, volume_db);
 }
 
 void MainWindow::reset_meters_button_clicked()
 {
-       global_mixer->reset_meters();
+       global_mixer->get_audio_mixer()->reset_meters();
        ui->peak_display->setText(QString::fromStdString(format_db(-HUGE_VAL, DB_WITH_SIGN | DB_BARE)));
        ui->peak_display->setStyleSheet("");
 }
 
-void MainWindow::audio_level_callback(float level_lufs, float peak_db, float global_level_lufs,
+void MainWindow::audio_level_callback(float level_lufs, float peak_db, vector<float> bus_level_lufs,
+                                      float global_level_lufs,
                                       float range_low_lufs, float range_high_lufs,
                                       float gain_staging_db, float final_makeup_gain_db,
                                       float correlation)
@@ -400,6 +419,12 @@ void MainWindow::audio_level_callback(float level_lufs, float peak_db, float glo
 
        post_to_main_thread([=]() {
                ui->vu_meter->set_level(level_lufs);
+               for (unsigned bus_index = 0; bus_index < bus_level_lufs.size(); ++bus_index) {
+                       if (bus_index < audio_miniviews.size()) {
+                               audio_miniviews[bus_index]->vu_meter_meter->set_level(
+                                       bus_level_lufs[bus_index]);
+                       }
+               }
                ui->lra_meter->set_levels(global_level_lufs, range_low_lufs, range_high_lufs);
                ui->correlation_meter->set_correlation(correlation);