X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=mainwindow.cpp;h=a16d5bd159bfde3b37ac85833907737102a7754c;hb=e4c99b681aceb0d960f1d56acc9dafc83643854b;hp=0837cc6afd70d3f47849f7954a6724e6524c6891;hpb=fc2dffc4d7d9b4af457742bef47689fe425f20e4;p=nageru

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 0837cc6..a16d5bd 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -127,6 +127,19 @@ string format_db(double db, unsigned flags)
 	return text;
 }
 
+void set_peak_label(QLabel *peak_label, float peak_db)
+{
+	peak_label->setText(QString::fromStdString(format_db(peak_db, DB_BARE)));
+
+	// -0.1 dBFS is EBU peak limit. We use it consistently, even for the bus meters
+	// (which don't calculate interpolate peak, and in general don't follow EBU recommendations).
+	if (peak_db > -0.1f) {
+		peak_label->setStyleSheet("QLabel { background-color: red; color: white; }");
+	} else {
+		peak_label->setStyleSheet("");
+	}
+}
+
 }  // namespace
 
 MainWindow::MainWindow()
@@ -233,23 +246,23 @@ void MainWindow::mixer_created(Mixer *mixer)
 	// not just the enable knobs implied by flags.
 #if 0
 	// TODO: Reenable for simple audio.
-	ui->locut_enabled->setChecked(global_mixer->get_audio_mixer()->get_locut_enabled(0));
+	ui->locut_enabled->setChecked(global_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);
+		global_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());
+	ui->gainstaging_knob->setValue(global_audio_mixer->get_gain_staging_db());
+	ui->gainstaging_auto_checkbox->setChecked(global_audio_mixer->get_gain_staging_auto());
+	ui->compressor_enabled->setChecked(global_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);
+		global_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);
+		global_audio_mixer->set_compressor_enabled(state == Qt::Checked);
 	});
 #else
 	ui->locut_enabled->setVisible(false);
@@ -262,8 +275,8 @@ void MainWindow::mixer_created(Mixer *mixer)
 	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());
+	ui->limiter_enabled->setChecked(global_audio_mixer->get_limiter_enabled());
+	ui->makeup_gain_auto_checkbox->setChecked(global_audio_mixer->get_final_makeup_gain_auto());
 
 	QString limiter_threshold_label(
 		QString::fromStdString(format_db(mixer->get_audio_mixer()->get_limiter_threshold_dbfs(), DB_WITH_SIGN)));
@@ -275,15 +288,15 @@ void MainWindow::mixer_created(Mixer *mixer)
 
 	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);
+		global_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->limiter_enabled, &QCheckBox::stateChanged, [this](int state){
-		global_mixer->get_audio_mixer()->set_limiter_enabled(state == Qt::Checked);
+		global_audio_mixer->set_limiter_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));
@@ -309,7 +322,7 @@ void MainWindow::setup_audio_miniview()
 	audio_miniviews.clear();
 
 	// Set up brand new ones from the input mapping.
-	InputMapping mapping = global_mixer->get_audio_mixer()->get_input_mapping();
+	InputMapping mapping = global_audio_mixer->get_input_mapping();
 	audio_miniviews.resize(mapping.buses.size());
 	for (unsigned bus_index = 0; bus_index < mapping.buses.size(); ++bus_index) {
 		QWidget *channel = new QWidget(this);
@@ -318,11 +331,22 @@ 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, bus_index, _1));
+		connect(ui_audio_miniview->peak_display_label, &ClickableLabel::clicked,
+		        [bus_index]() {
+				global_audio_mixer->reset_peak(bus_index);
+			});
 	}
 }
 
@@ -336,7 +360,7 @@ void MainWindow::setup_audio_expanded_view()
 	audio_expanded_views.clear();
 
 	// Set up brand new ones from the input mapping.
-	InputMapping mapping = global_mixer->get_audio_mixer()->get_input_mapping();
+	InputMapping mapping = global_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);
@@ -345,30 +369,60 @@ void MainWindow::setup_audio_expanded_view()
 		ui_audio_expanded_view->bus_desc_label->setFullText(
 			QString::fromStdString(mapping.buses[bus_index].name));
 		audio_expanded_views[bus_index] = ui_audio_expanded_view;
+		update_eq_label(bus_index, EQ_BAND_TREBLE, global_audio_mixer->get_eq(bus_index, EQ_BAND_TREBLE));
+		update_eq_label(bus_index, EQ_BAND_MID, global_audio_mixer->get_eq(bus_index, EQ_BAND_MID));
+		update_eq_label(bus_index, EQ_BAND_BASS, global_audio_mixer->get_eq(bus_index, EQ_BAND_BASS));
 		// 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));
+		ui_audio_expanded_view->locut_enabled->setChecked(global_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);
+			global_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->treble_knob, &QDial::valueChanged,
+		        bind(&MainWindow::eq_knob_changed, this, bus_index, EQ_BAND_TREBLE, _1));
+		connect(ui_audio_expanded_view->mid_knob, &QDial::valueChanged,
+		        bind(&MainWindow::eq_knob_changed, this, bus_index, EQ_BAND_MID, _1));
+		connect(ui_audio_expanded_view->bass_knob, &QDial::valueChanged,
+		        bind(&MainWindow::eq_knob_changed, this, bus_index, EQ_BAND_BASS, _1));
+
+		ui_audio_expanded_view->gainstaging_knob->setValue(global_audio_mixer->get_gain_staging_db(bus_index));
+		ui_audio_expanded_view->gainstaging_auto_checkbox->setChecked(global_audio_mixer->get_gain_staging_auto(bus_index));
+		ui_audio_expanded_view->compressor_enabled->setChecked(global_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);
+			global_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);
+			global_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);
+
+		connect(ui_audio_expanded_view->peak_display_label, &ClickableLabel::clicked,
+		        [bus_index]() {
+				global_audio_mixer->reset_peak(bus_index);
+			});
+
+		// 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);
 	}
+
+	update_cutoff_labels(global_audio_mixer->get_locut_cutoff());
 }
 
 void MainWindow::mixer_shutting_down()
@@ -423,7 +477,7 @@ void MainWindow::gain_staging_knob_changed(unsigned bus_index, int value)
 	}
 
 	float gain_db = value * 0.1f;
-	global_mixer->get_audio_mixer()->set_gain_staging_db(bus_index, gain_db);
+	global_audio_mixer->set_gain_staging_db(bus_index, gain_db);
 
 	// The label will be updated by the audio level callback.
 }
@@ -433,7 +487,7 @@ void MainWindow::final_makeup_gain_knob_changed(int value)
 	ui->makeup_gain_auto_checkbox->setCheckState(Qt::Unchecked);
 
 	float gain_db = value * 0.1f;
-	global_mixer->get_audio_mixer()->set_final_makeup_gain_db(gain_db);
+	global_audio_mixer->set_final_makeup_gain_db(gain_db);
 
 	// The label will be updated by the audio level callback.
 }
@@ -442,8 +496,12 @@ void MainWindow::cutoff_knob_changed(int value)
 {
 	float octaves = value * 0.1f;
 	float cutoff_hz = 20.0 * pow(2.0, octaves);
-	global_mixer->get_audio_mixer()->set_locut_cutoff(cutoff_hz);
+	global_audio_mixer->set_locut_cutoff(cutoff_hz);
+	update_cutoff_labels(cutoff_hz);
+}
 
+void MainWindow::update_cutoff_labels(float cutoff_hz)
+{
 	char buf[256];
 	snprintf(buf, sizeof(buf), "%ld Hz", lrintf(cutoff_hz));
 	ui->locut_cutoff_display->setText(buf);
@@ -488,10 +546,37 @@ void MainWindow::report_disk_space(off_t free_bytes, double estimated_seconds_le
 	});
 }
 
+void MainWindow::eq_knob_changed(unsigned bus_index, EQBand band, int value)
+{
+	float gain_db = value * 0.1f;
+	global_audio_mixer->set_eq(bus_index, band, gain_db);
+
+	update_eq_label(bus_index, band, gain_db);
+}
+
+void MainWindow::update_eq_label(unsigned bus_index, EQBand band, float gain_db)
+{
+	Ui::AudioExpandedView *view = audio_expanded_views[bus_index];
+	string db_string = format_db(gain_db, DB_WITH_SIGN);
+	switch (band) {
+	case EQ_BAND_TREBLE:
+		view->treble_label->setText(QString::fromStdString("Treble: " + db_string));
+		break;
+	case EQ_BAND_MID:
+		view->mid_label->setText(QString::fromStdString("Mid: " + db_string));
+		break;
+	case EQ_BAND_BASS:
+		view->bass_label->setText(QString::fromStdString("Bass: " + db_string));
+		break;
+	default:
+		assert(false);
+	}
+}
+
 void MainWindow::limiter_threshold_knob_changed(int value)
 {
 	float threshold_dbfs = value * 0.1f;
-	global_mixer->get_audio_mixer()->set_limiter_threshold_dbfs(threshold_dbfs);
+	global_audio_mixer->set_limiter_threshold_dbfs(threshold_dbfs);
 	ui->limiter_threshold_db_display->setText(
 		QString::fromStdString(format_db(threshold_dbfs, DB_WITH_SIGN)));
 	ui->limiter_threshold_db_display_2->setText(
@@ -501,7 +586,7 @@ void MainWindow::limiter_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(bus_index, threshold_dbfs);
+	global_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) {
@@ -518,26 +603,31 @@ void MainWindow::mini_fader_changed(int bus, double volume_db)
 	audio_miniviews[bus]->fader_label->setText(label);
 	audio_expanded_views[bus]->fader_label->setText(label);
 
-	global_mixer->get_audio_mixer()->set_fader_volume(bus, volume_db);
+	global_audio_mixer->set_fader_volume(bus, volume_db);
 }
 
 void MainWindow::reset_meters_button_clicked()
 {
-	global_mixer->get_audio_mixer()->reset_meters();
+	global_audio_mixer->reset_meters();
 	ui->peak_display->setText(QString::fromStdString(format_db(-HUGE_VAL, DB_WITH_SIGN | DB_BARE)));
 	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,
-                                      vector<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;
@@ -546,37 +636,43 @@ 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]);
+				set_peak_label(miniview->peak_display_label, level.historic_peak_dbfs);
 
 				Ui::AudioExpandedView *view = audio_expanded_views[bus_index];
-				view->vu_meter_meter->set_level(bus_level_lufs[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(gain_staging_db[bus_index] * 10.0f));
+				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(gain_staging_db[bus_index], DB_WITH_SIGN)));
+					QString::fromStdString(format_db(level.gain_staging_db, DB_WITH_SIGN)));
+				set_peak_label(view->peak_display_label, level.historic_peak_dbfs);
 			}
 		}
 		ui->lra_meter->set_levels(global_level_lufs, range_low_lufs, range_high_lufs);
 		ui->correlation_meter->set_correlation(correlation);
 
 		ui->peak_display->setText(QString::fromStdString(format_db(peak_db, DB_BARE)));
-		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("");
-		}
+		set_peak_label(ui->peak_display, peak_db);
 
 		// NOTE: Will be invisible when using multitrack audio.
 		ui->gainstaging_knob->blockSignals(true);
-		ui->gainstaging_knob->setValue(lrintf(gain_staging_db[0] * 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[0], 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));