Move the R128 and correlation measurements into AudioMixer.

[nageru] / mainwindow.cpp

diff --git a/mainwindow.cpp b/mainwindow.cpp
index a523be9230ca7ca7d58126dd1ec89f04453b538b..28f0393fce2c4a20e1ef50a180cb8314cc57a1ae 100644 (file)
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -217,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));
 
        struct sigaction act;
        memset(&act, 0, sizeof(act));
@@ -243,17 +243,17 @@ void MainWindow::setup_audio_miniview()
 
        // Set up brand new ones from the input mapping.
        InputMapping mapping = global_mixer->get_audio_mixer()->get_input_mapping();
-       for (unsigned i = 0; i < mapping.inputs.size(); ++i) {
+       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->channel_desc_label->setFullText(
-                       QString::fromStdString(mapping.inputs[i].name));
+               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, i, _1));
+                       bind(&MainWindow::mini_fader_changed, this, ui_audio_miniview, bus_index, _1));
        }
 }
 
@@ -391,7 +391,7 @@ void MainWindow::mini_fader_changed(Ui::AudioMiniView *ui, int channel, int valu
 
 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("");
 }