X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=mainwindow.cpp;h=2ef1da4502435bffe0a2ceb1354c134b1bd1a345;hb=1062c5403b57859c219558e736564a3d0bbecfd5;hp=923c4f9f199c45eabfbf05a50c70772e6013db15;hpb=54067dbc70999d936adf9d263b5ff2b1efb4dfd0;p=nageru

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 923c4f9..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()
@@ -330,6 +343,10 @@ void MainWindow::setup_audio_miniview()
 
 		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);
+			});
 	}
 }
 
@@ -382,6 +399,11 @@ void MainWindow::setup_audio_expanded_view()
 		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);
@@ -579,6 +601,7 @@ void MainWindow::audio_level_callback(float level_lufs, float peak_db, vector<Au
 					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->peak_meter->set_level(
@@ -592,17 +615,14 @@ void MainWindow::audio_level_callback(float level_lufs, float peak_db, vector<Au
 				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);