Rename InputMapping::Input to InputMapping::Bus; it's less ambiguous.

[nageru] / mainwindow.cpp

diff --git a/mainwindow.cpp b/mainwindow.cpp
index d5accf3ac0684d6f15b1a704ef6e6aff33458a5a..5eb631a8890efa2ba9131c5c298657821671a3e0 100644 (file)
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -22,6 +22,7 @@
 #include "disk_space_estimator.h"
 #include "flags.h"
 #include "glwidget.h"
+#include "input_mapping_dialog.h"
 #include "lrameter.h"
 #include "mixer.h"
 #include "post_to_main_thread.h"
@@ -109,6 +110,7 @@ MainWindow::MainWindow()
        connect(ui->cut_action, &QAction::triggered, this, &MainWindow::cut_triggered);
        connect(ui->exit_action, &QAction::triggered, this, &MainWindow::exit_triggered);
        connect(ui->about_action, &QAction::triggered, this, &MainWindow::about_triggered);
+       connect(ui->input_mapping_action, &QAction::triggered, this, &MainWindow::input_mapping_triggered);
 
        if (global_flags.x264_video_to_http) {
                connect(ui->x264_bitrate_action, &QAction::triggered, this, &MainWindow::x264_bitrate_triggered);
@@ -175,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.
@@ -244,6 +233,30 @@ 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;
+       }
+
+       // Set up brand new ones from the input mapping.
+       InputMapping mapping = global_mixer->get_audio_mixer()->get_input_mapping();
+       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));
+               // TODO: Set the fader position.
+               ui->faders->addWidget(channel);
+
+               connect(ui_audio_miniview->fader, &QAbstractSlider::valueChanged,
+                       bind(&MainWindow::mini_fader_changed, this, ui_audio_miniview, bus_index, _1));
+       }
+}
+
 void MainWindow::mixer_shutting_down()
 {
        ui->me_live->clean_context();
@@ -278,6 +291,13 @@ void MainWindow::about_triggered()
        AboutDialog().exec();
 }
 
+void MainWindow::input_mapping_triggered()
+{
+       if (InputMappingDialog().exec() == QDialog::Accepted) {
+               setup_audio_miniview();
+       }
+}
+
 void MainWindow::gain_staging_knob_changed(int value)
 {
        ui->gainstaging_auto_checkbox->setCheckState(Qt::Unchecked);
@@ -360,11 +380,13 @@ void MainWindow::compressor_threshold_knob_changed(int value)
 
 void MainWindow::mini_fader_changed(Ui::AudioMiniView *ui, int channel, int value)
 {
-       float volume_dbfs = value * 0.1f;
+       float volume_db = value * 0.1f;
 
        char buf[256];
-       snprintf(buf, sizeof(buf), "%+.1f dB", volume_dbfs);
+       snprintf(buf, sizeof(buf), "%+.1f dB", volume_db);
        ui->fader_label->setText(buf);
+
+       global_mixer->get_audio_mixer()->set_fader_volume(channel, volume_db);
 }
 
 void MainWindow::reset_meters_button_clicked()