X-Git-Url: https://git.sesse.net/?p=nageru;a=blobdiff_plain;f=mainwindow.cpp;h=923c4f9f199c45eabfbf05a50c70772e6013db15;hp=70e4261ce8abdadf97b0a2b821070841c569a156;hb=54067dbc70999d936adf9d263b5ff2b1efb4dfd0;hpb=608d2a0222f81a33dbea1c26f037a6fab713c436

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 70e4261..923c4f9 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -27,6 +27,7 @@
 #include "mixer.h"
 #include "post_to_main_thread.h"
 #include "ui_audio_miniview.h"
+#include "ui_audio_expanded_view.h"
 #include "ui_display.h"
 #include "ui_mainwindow.h"
 #include "vumeter.h"
@@ -78,6 +79,18 @@ void slave_checkbox(QCheckBox *master, QCheckBox *slave)
 	});
 }
 
+void slave_fader(NonLinearFader *master, NonLinearFader *slave)
+{
+	QWidget::connect(master, &NonLinearFader::dbValueChanged, [slave](double value) {
+		slave->blockSignals(true);
+		slave->setDbValue(value);
+		slave->blockSignals(false);
+	});
+	QWidget::connect(slave, &NonLinearFader::dbValueChanged, [master](double value){
+		master->setDbValue(value);
+	});
+}
+
 constexpr unsigned DB_NO_FLAGS = 0x0;
 constexpr unsigned DB_WITH_SIGN = 0x1;
 constexpr unsigned DB_BARE = 0x2;
@@ -208,6 +221,7 @@ void MainWindow::mixer_created(Mixer *mixer)
 	}
 
 	setup_audio_miniview();
+	setup_audio_expanded_view();
 
 	slave_knob(ui->locut_cutoff_knob, ui->locut_cutoff_knob_2);
 	slave_knob(ui->limiter_threshold_knob, ui->limiter_threshold_knob_2);
@@ -217,10 +231,37 @@ void MainWindow::mixer_created(Mixer *mixer)
 
 	// TODO: Fetch all of the values these for completeness,
 	// not just the enable knobs implied by flags.
-	ui->locut_enabled->setChecked(global_mixer->get_audio_mixer()->get_locut_enabled());
+#if 0
+	// TODO: Reenable for simple audio.
+	ui->locut_enabled->setChecked(global_mixer->get_audio_mixer()->get_locut_enabled(0));
+	connect(ui->locut_enabled, &QCheckBox::stateChanged, [this](int state){
+		global_mixer->get_audio_mixer()->set_locut_enabled(0, state == Qt::Checked);
+	});
 	ui->gainstaging_knob->setValue(global_mixer->get_audio_mixer()->get_gain_staging_db());
 	ui->gainstaging_auto_checkbox->setChecked(global_mixer->get_audio_mixer()->get_gain_staging_auto());
 	ui->compressor_enabled->setChecked(global_mixer->get_audio_mixer()->get_compressor_enabled());
+	connect(ui->gainstaging_knob, &QAbstractSlider::valueChanged, this, &MainWindow::gain_staging_knob_changed);
+	connect(ui->gainstaging_auto_checkbox, &QCheckBox::stateChanged, [this](int state){
+		global_mixer->get_audio_mixer()->set_gain_staging_auto(state == Qt::Checked);
+	});
+	ui->compressor_threshold_db_display->setText(
+		QString::fromStdString(format_db(mixer->get_audio_mixer()->get_compressor_threshold_dbfs(), DB_WITH_SIGN)));
+	ui->compressor_threshold_db_display->setText(buf);
+	connect(ui->compressor_threshold_knob, &QDial::valueChanged, this, &MainWindow::compressor_threshold_knob_changed);
+	connect(ui->compressor_enabled, &QCheckBox::stateChanged, [this](int state){
+		global_mixer->get_audio_mixer()->set_compressor_enabled(state == Qt::Checked);
+	});
+#else
+	ui->locut_enabled->setVisible(false);
+	ui->gainstaging_label->setVisible(false);
+	ui->gainstaging_knob->setVisible(false);
+	ui->gainstaging_db_display->setVisible(false);
+	ui->gainstaging_auto_checkbox->setVisible(false);
+	ui->compressor_threshold_label->setVisible(false);
+	ui->compressor_threshold_knob->setVisible(false);
+	ui->compressor_threshold_db_display->setVisible(false);
+	ui->compressor_enabled->setVisible(false);
+#endif
 	ui->limiter_enabled->setChecked(global_mixer->get_audio_mixer()->get_limiter_enabled());
 	ui->makeup_gain_auto_checkbox->setChecked(global_mixer->get_audio_mixer()->get_final_makeup_gain_auto());
 
@@ -228,34 +269,21 @@ void MainWindow::mixer_created(Mixer *mixer)
 		QString::fromStdString(format_db(mixer->get_audio_mixer()->get_limiter_threshold_dbfs(), DB_WITH_SIGN)));
 	ui->limiter_threshold_db_display->setText(limiter_threshold_label);
 	ui->limiter_threshold_db_display_2->setText(limiter_threshold_label);
-	ui->compressor_threshold_db_display->setText(
-		QString::fromStdString(format_db(mixer->get_audio_mixer()->get_compressor_threshold_dbfs(), DB_WITH_SIGN)));
 
 	connect(ui->locut_cutoff_knob, &QDial::valueChanged, this, &MainWindow::cutoff_knob_changed);
 	cutoff_knob_changed(ui->locut_cutoff_knob->value());
-	connect(ui->locut_enabled, &QCheckBox::stateChanged, [this](int state){
-		global_mixer->get_audio_mixer()->set_locut_enabled(state == Qt::Checked);
-	});
 
-	connect(ui->gainstaging_knob, &QAbstractSlider::valueChanged, this, &MainWindow::gain_staging_knob_changed);
-	connect(ui->gainstaging_auto_checkbox, &QCheckBox::stateChanged, [this](int state){
-		global_mixer->get_audio_mixer()->set_gain_staging_auto(state == Qt::Checked);
-	});
 	connect(ui->makeup_gain_knob, &QAbstractSlider::valueChanged, this, &MainWindow::final_makeup_gain_knob_changed);
 	connect(ui->makeup_gain_auto_checkbox, &QCheckBox::stateChanged, [this](int state){
 		global_mixer->get_audio_mixer()->set_final_makeup_gain_auto(state == Qt::Checked);
 	});
 
 	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->get_audio_mixer()->set_limiter_enabled(state == Qt::Checked);
 	});
-	connect(ui->compressor_enabled, &QCheckBox::stateChanged, [this](int state){
-		global_mixer->get_audio_mixer()->set_compressor_enabled(state == Qt::Checked);
-	});
 	connect(ui->reset_meters_button, &QPushButton::clicked, this, &MainWindow::reset_meters_button_clicked);
-	mixer->get_audio_mixer()->set_audio_level_callback(bind(&MainWindow::audio_level_callback, this, _1, _2, _3, _4, _5, _6, _7, _8, _9));
+	mixer->get_audio_mixer()->set_audio_level_callback(bind(&MainWindow::audio_level_callback, this, _1, _2, _3, _4, _5, _6, _7, _8));
 
 	struct sigaction act;
 	memset(&act, 0, sizeof(act));
@@ -290,11 +318,76 @@ void MainWindow::setup_audio_miniview()
 		ui_audio_miniview->bus_desc_label->setFullText(
 			QString::fromStdString(mapping.buses[bus_index].name));
 		audio_miniviews[bus_index] = ui_audio_miniview;
+
+		// Set up the peak meter.
+		VUMeter *peak_meter = ui_audio_miniview->peak_meter;
+		peak_meter->set_min_level(-30.0f);
+		peak_meter->set_max_level(0.0f);
+		peak_meter->set_ref_level(0.0f);
+
 		// TODO: Set the fader position.
 		ui->faders->addWidget(channel);
 
 		connect(ui_audio_miniview->fader, &NonLinearFader::dbValueChanged,
-			bind(&MainWindow::mini_fader_changed, this, ui_audio_miniview, bus_index, _1));
+			bind(&MainWindow::mini_fader_changed, this, bus_index, _1));
+	}
+}
+
+void MainWindow::setup_audio_expanded_view()
+{
+	// Remove any existing channels.
+	for (QLayoutItem *item; (item = ui->buses->takeAt(0)) != nullptr; ) {
+		delete item->widget();
+		delete item;
+	}
+	audio_expanded_views.clear();
+
+	// Set up brand new ones from the input mapping.
+	InputMapping mapping = global_mixer->get_audio_mixer()->get_input_mapping();
+	audio_expanded_views.resize(mapping.buses.size());
+	for (unsigned bus_index = 0; bus_index < mapping.buses.size(); ++bus_index) {
+		QWidget *channel = new QWidget(this);
+		Ui::AudioExpandedView *ui_audio_expanded_view = new Ui::AudioExpandedView;
+		ui_audio_expanded_view->setupUi(channel);
+		ui_audio_expanded_view->bus_desc_label->setFullText(
+			QString::fromStdString(mapping.buses[bus_index].name));
+		audio_expanded_views[bus_index] = ui_audio_expanded_view;
+		// TODO: Set the fader position.
+		ui->buses->addWidget(channel);
+
+		ui_audio_expanded_view->locut_enabled->setChecked(global_mixer->get_audio_mixer()->get_locut_enabled(bus_index));
+		connect(ui_audio_expanded_view->locut_enabled, &QCheckBox::stateChanged, [this, bus_index](int state){
+			global_mixer->get_audio_mixer()->set_locut_enabled(bus_index, state == Qt::Checked);
+		});
+
+		ui_audio_expanded_view->gainstaging_knob->setValue(global_mixer->get_audio_mixer()->get_gain_staging_db(bus_index));
+		ui_audio_expanded_view->gainstaging_auto_checkbox->setChecked(global_mixer->get_audio_mixer()->get_gain_staging_auto(bus_index));
+		ui_audio_expanded_view->compressor_enabled->setChecked(global_mixer->get_audio_mixer()->get_compressor_enabled(bus_index));
+
+		connect(ui_audio_expanded_view->gainstaging_knob, &QAbstractSlider::valueChanged, bind(&MainWindow::gain_staging_knob_changed, this, bus_index, _1));
+		connect(ui_audio_expanded_view->gainstaging_auto_checkbox, &QCheckBox::stateChanged, [this, bus_index](int state){
+			global_mixer->get_audio_mixer()->set_gain_staging_auto(bus_index, state == Qt::Checked);
+		});
+
+		connect(ui_audio_expanded_view->compressor_threshold_knob, &QDial::valueChanged, bind(&MainWindow::compressor_threshold_knob_changed, this, bus_index, _1));
+		connect(ui_audio_expanded_view->compressor_enabled, &QCheckBox::stateChanged, [this, bus_index](int state){
+			global_mixer->get_audio_mixer()->set_compressor_enabled(bus_index, state == Qt::Checked);
+		});
+
+		slave_fader(audio_miniviews[bus_index]->fader, ui_audio_expanded_view->fader);
+
+		// Set up the peak meter.
+		VUMeter *peak_meter = ui_audio_expanded_view->peak_meter;
+		peak_meter->set_min_level(-30.0f);
+		peak_meter->set_max_level(0.0f);
+		peak_meter->set_ref_level(0.0f);
+
+		// Set up the compression attenuation meter.
+		VUMeter *reduction_meter = ui_audio_expanded_view->reduction_meter;
+		reduction_meter->set_min_level(0.0f);
+		reduction_meter->set_max_level(10.0f);
+		reduction_meter->set_ref_level(0.0f);
+		reduction_meter->set_flip(true);
 	}
 }
 
@@ -336,15 +429,21 @@ void MainWindow::input_mapping_triggered()
 {
 	if (InputMappingDialog().exec() == QDialog::Accepted) {
 		setup_audio_miniview();
+		setup_audio_expanded_view();
 	}
 }
 
-void MainWindow::gain_staging_knob_changed(int value)
+void MainWindow::gain_staging_knob_changed(unsigned bus_index, int value)
 {
-	ui->gainstaging_auto_checkbox->setCheckState(Qt::Unchecked);
+	if (bus_index == 0) {
+		ui->gainstaging_auto_checkbox->setCheckState(Qt::Unchecked);
+	}
+	if (bus_index < audio_expanded_views.size()) {
+		audio_expanded_views[bus_index]->gainstaging_auto_checkbox->setCheckState(Qt::Unchecked);
+	}
 
 	float gain_db = value * 0.1f;
-	global_mixer->get_audio_mixer()->set_gain_staging_db(gain_db);
+	global_mixer->get_audio_mixer()->set_gain_staging_db(bus_index, gain_db);
 
 	// The label will be updated by the audio level callback.
 }
@@ -369,6 +468,11 @@ void MainWindow::cutoff_knob_changed(int value)
 	snprintf(buf, sizeof(buf), "%ld Hz", lrintf(cutoff_hz));
 	ui->locut_cutoff_display->setText(buf);
 	ui->locut_cutoff_display_2->setText(buf);
+
+	for (unsigned bus_index = 0; bus_index < audio_expanded_views.size(); ++bus_index) {
+		audio_expanded_views[bus_index]->locut_enabled->setText(
+			QString("Lo-cut: ") + buf);
+	}
 }
 
 void MainWindow::report_disk_space(off_t free_bytes, double estimated_seconds_left)
@@ -414,25 +518,27 @@ void MainWindow::limiter_threshold_knob_changed(int value)
 		QString::fromStdString(format_db(threshold_dbfs, DB_WITH_SIGN)));
 }
 
-void MainWindow::compressor_threshold_knob_changed(int value)
+void MainWindow::compressor_threshold_knob_changed(unsigned bus_index, int value)
 {
 	float threshold_dbfs = value * 0.1f;
-	global_mixer->get_audio_mixer()->set_compressor_threshold_dbfs(threshold_dbfs);
-	ui->compressor_threshold_db_display->setText(
-		QString::fromStdString(format_db(threshold_dbfs, DB_WITH_SIGN)));
+	global_mixer->get_audio_mixer()->set_compressor_threshold_dbfs(bus_index, threshold_dbfs);
+
+	QString label(QString::fromStdString(format_db(threshold_dbfs, DB_WITH_SIGN)));
+	if (bus_index == 0) {
+		ui->compressor_threshold_db_display->setText(label);
+	}
+	if (bus_index < audio_expanded_views.size()) {
+		audio_expanded_views[bus_index]->compressor_threshold_db_display->setText(label);
+	}
 }
 
-void MainWindow::mini_fader_changed(Ui::AudioMiniView *ui, int channel, double volume_db)
+void MainWindow::mini_fader_changed(int bus, double volume_db)
 {
-	char buf[256];
-	if (isfinite(volume_db)) {
-		snprintf(buf, sizeof(buf), "%+.1f dB", volume_db);
-		ui->fader_label->setText(buf);
-	} else {
-		ui->fader_label->setText("-∞ dB");
-	}
+	QString label(QString::fromStdString(format_db(volume_db, DB_WITH_SIGN)));
+	audio_miniviews[bus]->fader_label->setText(label);
+	audio_expanded_views[bus]->fader_label->setText(label);
 
-	global_mixer->get_audio_mixer()->set_fader_volume(channel, volume_db);
+	global_mixer->get_audio_mixer()->set_fader_volume(bus, volume_db);
 }
 
 void MainWindow::reset_meters_button_clicked()
@@ -442,16 +548,21 @@ void MainWindow::reset_meters_button_clicked()
 	ui->peak_display->setStyleSheet("");
 }
 
-void MainWindow::audio_level_callback(float level_lufs, float peak_db, vector<float> bus_level_lufs,
+void MainWindow::audio_level_callback(float level_lufs, float peak_db, vector<AudioMixer::BusLevel> bus_levels,
                                       float global_level_lufs,
                                       float range_low_lufs, float range_high_lufs,
-                                      float gain_staging_db, float final_makeup_gain_db,
+                                      float final_makeup_gain_db,
                                       float correlation)
 {
 	steady_clock::time_point now = steady_clock::now();
 
 	// The meters are somewhat inefficient to update. Only update them
-	// every 100 ms or so (we get updates every 5–20 ms).
+	// every 100 ms or so (we get updates every 5–20 ms). Note that this
+	// means that the digital peak meters are ever so slightly too low
+	// (each update won't be a faithful representation of the highest peak
+	// since the previous update, since there are frames we won't draw),
+	// but the _peak_ of the peak meters will be correct (it's tracked in
+	// AudioMixer, not here), and that's much more important.
 	double last_update_age = duration<double>(now - last_audio_level_callback).count();
 	if (last_update_age < 0.100) {
 		return;
@@ -460,10 +571,27 @@ void MainWindow::audio_level_callback(float level_lufs, float peak_db, vector<fl
 
 	post_to_main_thread([=]() {
 		ui->vu_meter->set_level(level_lufs);
-		for (unsigned bus_index = 0; bus_index < bus_level_lufs.size(); ++bus_index) {
+		for (unsigned bus_index = 0; bus_index < bus_levels.size(); ++bus_index) {
 			if (bus_index < audio_miniviews.size()) {
-				audio_miniviews[bus_index]->vu_meter_meter->set_level(
-					bus_level_lufs[bus_index]);
+				const AudioMixer::BusLevel &level = bus_levels[bus_index];
+				Ui::AudioMiniView *miniview = audio_miniviews[bus_index];
+				miniview->peak_meter->set_level(
+					level.current_level_dbfs[0], level.current_level_dbfs[1]);
+				miniview->peak_meter->set_peak(
+					level.peak_level_dbfs[0], level.peak_level_dbfs[1]);
+
+				Ui::AudioExpandedView *view = audio_expanded_views[bus_index];
+				view->peak_meter->set_level(
+					level.current_level_dbfs[0], level.current_level_dbfs[1]);
+				view->peak_meter->set_peak(
+					level.peak_level_dbfs[0], level.peak_level_dbfs[1]);
+				view->reduction_meter->set_level(level.compressor_attenuation_db);
+				view->gainstaging_knob->blockSignals(true);
+				view->gainstaging_knob->setValue(lrintf(level.gain_staging_db * 10.0f));
+				view->gainstaging_knob->blockSignals(false);
+				view->gainstaging_db_display->setText(
+					QString("Gain: ") +
+					QString::fromStdString(format_db(level.gain_staging_db, DB_WITH_SIGN)));
 			}
 		}
 		ui->lra_meter->set_levels(global_level_lufs, range_low_lufs, range_high_lufs);
@@ -476,11 +604,12 @@ void MainWindow::audio_level_callback(float level_lufs, float peak_db, vector<fl
 			ui->peak_display->setStyleSheet("");
 		}
 
+		// NOTE: Will be invisible when using multitrack audio.
 		ui->gainstaging_knob->blockSignals(true);
-		ui->gainstaging_knob->setValue(lrintf(gain_staging_db * 10.0f));
+		ui->gainstaging_knob->setValue(lrintf(bus_levels[0].gain_staging_db * 10.0f));
 		ui->gainstaging_knob->blockSignals(false);
 		ui->gainstaging_db_display->setText(
-			QString::fromStdString(format_db(gain_staging_db, DB_WITH_SIGN)));
+			QString::fromStdString(format_db(bus_levels[0].gain_staging_db, DB_WITH_SIGN)));
 
 		ui->makeup_gain_knob->blockSignals(true);
 		ui->makeup_gain_knob->setValue(lrintf(final_makeup_gain_db * 10.0f));