Make side-by-side handle other inputs than 1280x720.

[nageru] / mainwindow.cpp

diff --git a/mainwindow.cpp b/mainwindow.cpp
index a19a4560ab1c69b5bae9f42d871d16fff511d47f..9f293342e8deda072defe176ea8baf308083190b 100644 (file)
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -53,6 +53,7 @@ MainWindow::MainWindow()
        transition_btn3 = ui->transition_btn3;
        qRegisterMetaType<std::vector<std::string>>("std::vector<std::string>");
        connect(ui->me_preview, &GLWidget::transition_names_updated, this, &MainWindow::set_transition_names);
+       qRegisterMetaType<Mixer::Output>("Mixer::Output");
 }
 
 void MainWindow::resizeEvent(QResizeEvent* event)
@@ -83,6 +84,9 @@ void MainWindow::mixer_created(Mixer *mixer)
                // Hook up the click.
                connect(ui_display->display, &GLWidget::clicked, bind(&MainWindow::channel_clicked, this, i));
 
+               // Let the theme update the text whenever the resolution changed.
+               connect(ui_display->display, &GLWidget::resolution_updated, this, &MainWindow::update_channel_name);
+
                // Hook up the keyboard key.
                QShortcut *shortcut = new QShortcut(QKeySequence(Qt::Key_1 + i), this);
                connect(shortcut, &QShortcut::activated, bind(&MainWindow::channel_clicked, this, i));
@@ -92,7 +96,15 @@ void MainWindow::mixer_created(Mixer *mixer)
                connect(ui_display->wb_button, &QPushButton::clicked, bind(&MainWindow::wb_button_clicked, this, i));
        }
 
+       char buf[256];
+       snprintf(buf, sizeof(buf), "%.1f dB", mixer->get_limiter_threshold_dbfs());
+       ui->limiter_threshold_db_display->setText(buf);
+       snprintf(buf, sizeof(buf), "%.1f dB", mixer->get_compressor_threshold_dbfs());
+       ui->compressor_threshold_db_display->setText(buf);
+
        connect(ui->locut_cutoff_knob, &QDial::valueChanged, this, &MainWindow::cutoff_knob_changed);
+       cutoff_knob_changed(ui->locut_cutoff_knob->value());
+
        connect(ui->limiter_threshold_knob, &QDial::valueChanged, this, &MainWindow::limiter_threshold_knob_changed);
        connect(ui->compressor_threshold_knob, &QDial::valueChanged, this, &MainWindow::compressor_threshold_knob_changed);
        connect(ui->limiter_enabled, &QCheckBox::stateChanged, [this](int state){
@@ -145,6 +157,18 @@ void MainWindow::reset_meters_button_clicked()
 
 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)
 {
+       timeval now;
+       gettimeofday(&now, nullptr);
+
+       // The meters are somewhat inefficient to update. Only update them
+       // every 100 ms or so (we get updates every 5–20 ms).
+       double last_update_age = now.tv_sec - last_audio_level_callback.tv_sec +
+               1e-6 * (now.tv_usec - last_audio_level_callback.tv_usec);
+       if (last_update_age < 0.100) {
+               return;
+       }
+       last_audio_level_callback = now;
+
        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);
@@ -227,6 +251,14 @@ void MainWindow::set_transition_names(vector<string> transition_names)
        }
 }
 
+void MainWindow::update_channel_name(Mixer::Output output)
+{
+       if (output >= Mixer::OUTPUT_INPUT0) {
+               unsigned channel = output - Mixer::OUTPUT_INPUT0;
+               previews[channel]->label->setText(global_mixer->get_channel_name(output).c_str());
+       }
+}
+
 void MainWindow::transition_clicked(int transition_number)
 {
        global_mixer->transition_clicked(transition_number);