Hook up the OK button in the about dialog.

[nageru] / mainwindow.cpp

diff --git a/mainwindow.cpp b/mainwindow.cpp
index fbfbecda05fbb3eb4afe92ce03766d3bb1ea9376..311e573272de89d97f36173af23fca1dd5f81de0 100644 (file)
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -15,6 +15,7 @@
 #include <QSize>
 #include <QString>
 
+#include "aboutdialog.h"
 #include "glwidget.h"
 #include "lrameter.h"
 #include "mixer.h"
@@ -41,9 +42,10 @@ MainWindow::MainWindow()
        ui->me_live->set_output(Mixer::OUTPUT_LIVE);
        ui->me_preview->set_output(Mixer::OUTPUT_PREVIEW);
 
-       // The menu.
+       // The menus.
        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),
 
        // Hook up the transition buttons.
        // TODO: Make them dynamic.
@@ -109,8 +111,14 @@ void MainWindow::mixer_created(Mixer *mixer)
        connect(ui->locut_cutoff_knob, &QDial::valueChanged, this, &MainWindow::cutoff_knob_changed);
        cutoff_knob_changed(ui->locut_cutoff_knob->value());
 
+       // Not QDial::valueChanged, as we call setValue() all the time.
+       connect(ui->gainstaging_knob, &QAbstractSlider::sliderMoved, this, &MainWindow::gain_staging_knob_changed);
        connect(ui->gainstaging_auto_checkbox, &QCheckBox::stateChanged, [this](int state){
-               global_mixer->set_gainstaging_auto(state == Qt::Checked);
+               global_mixer->set_gain_staging_auto(state == Qt::Checked);
+       });
+       connect(ui->makeup_gain_knob, &QAbstractSlider::sliderMoved, this, &MainWindow::final_makeup_gain_knob_changed);
+       connect(ui->makeup_gain_auto_checkbox, &QCheckBox::stateChanged, [this](int state){
+               global_mixer->set_final_makeup_gain_auto(state == Qt::Checked);
        });
 
        connect(ui->limiter_threshold_knob, &QDial::valueChanged, this, &MainWindow::limiter_threshold_knob_changed);
@@ -122,7 +130,7 @@ void MainWindow::mixer_created(Mixer *mixer)
                global_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));
+       mixer->set_audio_level_callback(bind(&MainWindow::audio_level_callback, this, _1, _2, _3, _4, _5, _6, _7));
 }
 
 void MainWindow::mixer_shutting_down()
@@ -144,6 +152,31 @@ void MainWindow::exit_triggered()
        close();
 }
 
+void MainWindow::about_triggered()
+{
+       AboutDialog().exec();
+}
+
+void MainWindow::gain_staging_knob_changed(int value)
+{
+       ui->gainstaging_auto_checkbox->setCheckState(Qt::Unchecked);
+
+       float gain_db = value * 0.1f;
+       global_mixer->set_gain_staging_db(gain_db);
+
+       // The label will be updated by the audio level callback.
+}
+
+void MainWindow::final_makeup_gain_knob_changed(int value)
+{
+       ui->makeup_gain_auto_checkbox->setCheckState(Qt::Unchecked);
+
+       float gain_db = value * 0.1f;
+       global_mixer->set_final_makeup_gain_db(gain_db);
+
+       // The label will be updated by the audio level callback.
+}
+
 void MainWindow::cutoff_knob_changed(int value)
 {
        float octaves = value * 0.1f;
@@ -182,7 +215,7 @@ void MainWindow::reset_meters_button_clicked()
        ui->peak_display->setStyleSheet("");
 }
 
-void MainWindow::audio_level_callback(float level_lufs, float peak_db, float global_level_lufs, float range_low_lufs, float range_high_lufs, float auto_gain_staging_db)
+void MainWindow::audio_level_callback(float level_lufs, float peak_db, float global_level_lufs, float range_low_lufs, float range_high_lufs, float gain_staging_db, float final_makeup_gain_db)
 {
        timeval now;
        gettimeofday(&now, nullptr);
@@ -209,9 +242,13 @@ void MainWindow::audio_level_callback(float level_lufs, float peak_db, float glo
                        ui->peak_display->setStyleSheet("");
                }
 
-               ui->gainstaging_knob->setValue(lrintf(auto_gain_staging_db * 10.0f));
-               snprintf(buf, sizeof(buf), "%+.1f dB", auto_gain_staging_db);
+               ui->gainstaging_knob->setValue(lrintf(gain_staging_db * 10.0f));
+               snprintf(buf, sizeof(buf), "%+.1f dB", gain_staging_db);
                ui->gainstaging_db_display->setText(buf);
+
+               ui->makeup_gain_knob->setValue(lrintf(final_makeup_gain_db * 10.0f));
+               snprintf(buf, sizeof(buf), "%+.1f dB", final_makeup_gain_db);
+               ui->makeup_gain_db_display->setText(buf);
        });
 }