Remove a sort-of obsolete TODO.

[nageru] / mainwindow.cpp

diff --git a/mainwindow.cpp b/mainwindow.cpp
index ffaf6ba54dc41da5c448dfd2265147e868df41a8..d4e4d62d3fab6cb87fafb089dd458f2937ac7905 100644 (file)
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -18,6 +18,7 @@
 #include "glwidget.h"
 #include "lrameter.h"
 #include "mixer.h"
+#include "post_to_main_thread.h"
 #include "ui_display.h"
 #include "ui_mainwindow.h"
 #include "vumeter.h"
@@ -90,24 +91,29 @@ void MainWindow::mixer_created(Mixer *mixer)
                connect(ui_display->wb_button, &QPushButton::clicked, std::bind(&MainWindow::wb_button_clicked, this, i));
        }
 
-       mixer->set_audio_level_callback([this](float level_lufs, float peak_db, float global_level_lufs, float range_low_lufs, float range_high_lufs){
-               ui->vu_meter->set_level(level_lufs);
-               ui->lra_meter->set_levels(global_level_lufs, range_low_lufs, range_high_lufs);
-
-               char buf[256];
-               snprintf(buf, sizeof(buf), "%.1f", peak_db);
-               ui->peak_display->setText(buf);
-               if (peak_db > -0.1f) {  // -0.1 dBFS is EBU peak limit.
-                       ui->peak_display->setStyleSheet("QLabel { background-color: red; color: white; }");
-               } else {
-                       ui->peak_display->setStyleSheet("");
-               }
+       mixer->set_audio_level_callback([this](float level_lufs, float peak_db, float global_level_lufs, float range_low_lufs, float range_high_lufs, float auto_gain_staging_db){
+               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);
+
+                       char buf[256];
+                       snprintf(buf, sizeof(buf), "%.1f", peak_db);
+                       ui->peak_display->setText(buf);
+                       if (peak_db > -0.1f) {  // -0.1 dBFS is EBU peak limit.
+                               ui->peak_display->setStyleSheet("QLabel { background-color: red; color: white; }");
+                       } else {
+                               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_db_display->setText(buf);
+               });
        });
 }
 
 void MainWindow::relayout()
 {
-       int width = ui->vertical_layout->geometry().width();
        int height = ui->vertical_layout->geometry().height();
 
        double remaining_height = height;
@@ -128,7 +134,8 @@ void MainWindow::relayout()
 
        // The previews will be constrained by the remaining height, and the width.
        double preview_label_height = previews[0]->title_bar->geometry().height() + ui->preview_displays->spacing();  // Wrong spacing?
-       double preview_height = std::min(remaining_height - preview_label_height, (width / double(previews.size())) * 9.0 / 16.0);
+       int preview_total_width = ui->preview_displays->geometry().width();
+       double preview_height = std::min(remaining_height - preview_label_height, (preview_total_width / double(previews.size())) * 9.0 / 16.0);
        remaining_height -= preview_height + preview_label_height + ui->vertical_layout->spacing();
 
        ui->vertical_layout->setStretch(0, lrintf(me_height));
@@ -138,13 +145,15 @@ void MainWindow::relayout()
 
        // Set the widths for the previews.
        double preview_width = preview_height * 16.0 / 9.0;
+       double remaining_preview_width = preview_total_width;
 
        for (unsigned i = 0; i < previews.size(); ++i) {
                ui->preview_displays->setStretch(i, lrintf(preview_width));
+               remaining_preview_width -= preview_width + ui->preview_displays->spacing();
        }
 
        // The preview horizontal spacer.
-       ui->preview_displays->setStretch(previews.size(), lrintf(width - (previews.size() + ui->preview_displays->spacing()) * preview_width));
+       ui->preview_displays->setStretch(previews.size(), lrintf(remaining_preview_width));
 }
 
 void MainWindow::set_transition_names(vector<string> transition_names)