X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=mainwindow.cpp;h=2ef1da4502435bffe0a2ceb1354c134b1bd1a345;hb=1062c5403b57859c219558e736564a3d0bbecfd5;hp=573cc0e4b55a8ce4d99d1dd6da82a8e864c9d4ab;hpb=4380d627aecf9f4dbe4dff524dacd4b550b07f14;p=nageru

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 573cc0e..2ef1da4 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()
@@ -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_mixer->get_audio_mixer()->reset_peak(bus_index);
+			});
 	}
 }
 
@@ -368,6 +392,24 @@ void MainWindow::setup_audio_expanded_view()
 		});
 
 		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_mixer->get_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);
 	}
 }
 
@@ -537,7 +579,12 @@ void MainWindow::audio_level_callback(float level_lufs, float peak_db, vector<Au
 	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;
@@ -549,27 +596,33 @@ void MainWindow::audio_level_callback(float level_lufs, float peak_db, vector<Au
 		for (unsigned bus_index = 0; bus_index < bus_levels.size(); ++bus_index) {
 			if (bus_index < audio_miniviews.size()) {
 				const AudioMixer::BusLevel &level = bus_levels[bus_index];
-				audio_miniviews[bus_index]->vu_meter_meter->set_level(level.loudness_lufs);
+				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(level.loudness_lufs);
+				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)));
+				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);