X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=mainwindow.cpp;h=7ec6f0c311077ea613ce3663f3d7da045e362fff;hb=635bc53e064f4cd96d4271a8a28b59b301d5921d;hp=0e96a8a4cdd95c57dd2ac0e037559fc5455a2d00;hpb=98ad355aa5775199aa75089b3fb29ccf552c529e;p=nageru

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 0e96a8a..7ec6f0c 100644
--- 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"
@@ -25,6 +26,7 @@
 class QResizeEvent;
 
 using namespace std;
+using namespace std::placeholders;
 
 Q_DECLARE_METATYPE(std::vector<std::string>);
 
@@ -41,9 +43,9 @@ MainWindow::MainWindow()
 
 	// Hook up the transition buttons.
 	// TODO: Make them dynamic.
-	connect(ui->transition_btn1, &QPushButton::clicked, std::bind(&MainWindow::transition_clicked, this, 0));
-	connect(ui->transition_btn2, &QPushButton::clicked, std::bind(&MainWindow::transition_clicked, this, 1));
-	connect(ui->transition_btn3, &QPushButton::clicked, std::bind(&MainWindow::transition_clicked, this, 2));
+	connect(ui->transition_btn1, &QPushButton::clicked, bind(&MainWindow::transition_clicked, this, 0));
+	connect(ui->transition_btn2, &QPushButton::clicked, bind(&MainWindow::transition_clicked, this, 1));
+	connect(ui->transition_btn3, &QPushButton::clicked, bind(&MainWindow::transition_clicked, this, 2));
 
 	// Aiee...
 	transition_btn1 = ui->transition_btn1;
@@ -79,18 +81,35 @@ void MainWindow::mixer_created(Mixer *mixer)
 		previews.push_back(ui_display);
 
 		// Hook up the click.
-		connect(ui_display->display, &GLWidget::clicked, std::bind(&MainWindow::channel_clicked, this, i));
+		connect(ui_display->display, &GLWidget::clicked, bind(&MainWindow::channel_clicked, this, i));
 
 		// Hook up the keyboard key.
 		QShortcut *shortcut = new QShortcut(QKeySequence(Qt::Key_1 + i), this);
-		connect(shortcut, &QShortcut::activated, std::bind(&MainWindow::channel_clicked, this, i));
+		connect(shortcut, &QShortcut::activated, bind(&MainWindow::channel_clicked, this, i));
 
 		// Hook up the white balance button (irrelevant if invisible).
 		ui_display->wb_button->setVisible(mixer->get_supports_set_wb(output));
-		connect(ui_display->wb_button, &QPushButton::clicked, std::bind(&MainWindow::wb_button_clicked, this, i));
+		connect(ui_display->wb_button, &QPushButton::clicked, 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){
+	connect(ui->locut_cutoff_knob, &QDial::valueChanged, this, &MainWindow::cutoff_knob_changed);
+	mixer->set_audio_level_callback(bind(&MainWindow::audio_level_callback, this, _1, _2, _3, _4, _5, _6));
+}
+
+void MainWindow::cutoff_knob_changed(int value)
+{
+	float octaves = value * 0.1f;
+	float cutoff_hz = 20.0 * pow(2.0, octaves);
+	global_mixer->set_locut_cutoff(cutoff_hz);
+
+	char buf[256];
+	snprintf(buf, sizeof(buf), "%ld Hz", lrintf(cutoff_hz));
+	ui->locut_cutoff_display->setText(buf);
+}
+
+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)
+{
+	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);
 
@@ -102,6 +121,10 @@ void MainWindow::mixer_created(Mixer *mixer)
 		} 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);
 	});
 }