Make the faders in the expanded audio view work.

[nageru] / mainwindow.cpp

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 70e4261ce8abdadf97b0a2b821070841c569a156..99e8cc328bfeb1f77c58cd47dd7a4776cede46dd 100644 (file)
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -27,6 +27,7 @@
 #include "mixer.h"
 #include "post_to_main_thread.h"
 #include "ui_audio_miniview.h"
+#include "ui_audio_expanded_view.h"
 #include "ui_display.h"
 #include "ui_mainwindow.h"
 #include "vumeter.h"
@@ -78,6 +79,18 @@ void slave_checkbox(QCheckBox *master, QCheckBox *slave)
        });
 }
 
+void slave_fader(NonLinearFader *master, NonLinearFader *slave)
+{
+       QWidget::connect(master, &NonLinearFader::dbValueChanged, [slave](double value) {
+               slave->blockSignals(true);
+               slave->setDbValue(value);
+               slave->blockSignals(false);
+       });
+       QWidget::connect(slave, &NonLinearFader::dbValueChanged, [master](double value){
+               master->setDbValue(value);
+       });
+}
+
 constexpr unsigned DB_NO_FLAGS = 0x0;
 constexpr unsigned DB_WITH_SIGN = 0x1;
 constexpr unsigned DB_BARE = 0x2;
@@ -208,6 +221,7 @@ void MainWindow::mixer_created(Mixer *mixer)
        }
 
        setup_audio_miniview();
+       setup_audio_expanded_view();
 
        slave_knob(ui->locut_cutoff_knob, ui->locut_cutoff_knob_2);
        slave_knob(ui->limiter_threshold_knob, ui->limiter_threshold_knob_2);
@@ -294,7 +308,33 @@ void MainWindow::setup_audio_miniview()
                ui->faders->addWidget(channel);
 
                connect(ui_audio_miniview->fader, &NonLinearFader::dbValueChanged,
-                       bind(&MainWindow::mini_fader_changed, this, ui_audio_miniview, bus_index, _1));
+                       bind(&MainWindow::mini_fader_changed, this, bus_index, _1));
+       }
+}
+
+void MainWindow::setup_audio_expanded_view()
+{
+       // Remove any existing channels.
+       for (QLayoutItem *item; (item = ui->buses->takeAt(0)) != nullptr; ) {
+               delete item->widget();
+               delete item;
+       }
+       audio_expanded_views.clear();
+
+       // Set up brand new ones from the input mapping.
+       InputMapping mapping = global_mixer->get_audio_mixer()->get_input_mapping();
+       audio_expanded_views.resize(mapping.buses.size());
+       for (unsigned bus_index = 0; bus_index < mapping.buses.size(); ++bus_index) {
+               QWidget *channel = new QWidget(this);
+               Ui::AudioExpandedView *ui_audio_expanded_view = new Ui::AudioExpandedView;
+               ui_audio_expanded_view->setupUi(channel);
+               ui_audio_expanded_view->bus_desc_label->setFullText(
+                       QString::fromStdString(mapping.buses[bus_index].name));
+               audio_expanded_views[bus_index] = ui_audio_expanded_view;
+               // TODO: Set the fader position.
+               ui->buses->addWidget(channel);
+
+               slave_fader(audio_miniviews[bus_index]->fader, ui_audio_expanded_view->fader);
        }
 }
 
@@ -336,6 +376,7 @@ void MainWindow::input_mapping_triggered()
 {
        if (InputMappingDialog().exec() == QDialog::Accepted) {
                setup_audio_miniview();
+               setup_audio_expanded_view();
        }
 }
 
@@ -422,17 +463,13 @@ 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, double volume_db)
+void MainWindow::mini_fader_changed(int bus, double volume_db)
 {
-       char buf[256];
-       if (isfinite(volume_db)) {
-               snprintf(buf, sizeof(buf), "%+.1f dB", volume_db);
-               ui->fader_label->setText(buf);
-       } else {
-               ui->fader_label->setText("-∞ dB");
-       }
+       QString label(QString::fromStdString(format_db(volume_db, DB_WITH_SIGN)));
+       audio_miniviews[bus]->fader_label->setText(label);
+       audio_expanded_views[bus]->fader_label->setText(label);
 
-       global_mixer->get_audio_mixer()->set_fader_volume(channel, volume_db);
+       global_mixer->get_audio_mixer()->set_fader_volume(bus, volume_db);
 }
 
 void MainWindow::reset_meters_button_clicked()