]> git.sesse.net Git - nageru/blobdiff - mainwindow.cpp
Fix an instance of undefined integer behavior. Found by the Clang static analyzer.
[nageru] / mainwindow.cpp
index 01d9de143569ac57a45d17f9065bff2b41239cea..77daf078b0000e643e2b7a5c2bc2aa0e931bed8a 100644 (file)
@@ -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.
@@ -128,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, _7));
+       mixer->set_audio_level_callback(bind(&MainWindow::audio_level_callback, this, _1, _2, _3, _4, _5, _6, _7, _8));
 }
 
 void MainWindow::mixer_shutting_down()
@@ -150,6 +152,11 @@ 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);
@@ -208,7 +215,10 @@ 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 gain_staging_db, float final_makeup_gain_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,
+                                      float correlation)
 {
        timeval now;
        gettimeofday(&now, nullptr);
@@ -225,6 +235,7 @@ void MainWindow::audio_level_callback(float level_lufs, float peak_db, float glo
        post_to_main_thread([=]() {
                ui->vu_meter->set_level(level_lufs);
                ui->lra_meter->set_levels(global_level_lufs, range_low_lufs, range_high_lufs);
+               ui->correlation_meter->set_correlation(correlation);
 
                char buf[256];
                snprintf(buf, sizeof(buf), "%.1f", peak_db);