Make the muxing buffer configurable, and 10 MB (since 1 MB is too little for our...

[nageru] / mainwindow.cpp

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 854eb08663176a4a1e1a1fcf627e48d30c2edf98..34db733bababc8b0e4f63b1233432fe2aab377e6 100644 (file)
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -92,7 +92,21 @@ 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);
+       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){
+               global_mixer->set_limiter_enabled(state == Qt::Checked);
+       });
+       connect(ui->compressor_enabled, &QCheckBox::stateChanged, [this](int state){
+               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));
 }
@@ -108,6 +122,26 @@ void MainWindow::cutoff_knob_changed(int value)
        ui->locut_cutoff_display->setText(buf);
 }
 
+void MainWindow::limiter_threshold_knob_changed(int value)
+{
+       float threshold_dbfs = value * 0.1f;
+       global_mixer->set_limiter_threshold_dbfs(threshold_dbfs);
+
+       char buf[256];
+       snprintf(buf, sizeof(buf), "%.1f dB", threshold_dbfs);
+       ui->limiter_threshold_db_display->setText(buf);
+}
+
+void MainWindow::compressor_threshold_knob_changed(int value)
+{
+       float threshold_dbfs = value * 0.1f;
+       global_mixer->set_compressor_threshold_dbfs(threshold_dbfs);
+
+       char buf[256];
+       snprintf(buf, sizeof(buf), "%.1f dB", threshold_dbfs);
+       ui->compressor_threshold_db_display->setText(buf);
+}
+
 void MainWindow::reset_meters_button_clicked()
 {
        global_mixer->reset_meters();
@@ -117,6 +151,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);