From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Thu, 29 Oct 2015 19:36:53 +0000 (+0100)
Subject: Fix VU meter range.
X-Git-Tag: 1.0.0~213
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=94c0099fc26cb9c55c2a9a1436a3e8f740a4bb8a;p=nageru

Fix VU meter range.
---

diff --git a/vumeter.cpp b/vumeter.cpp
index 03a93e7..ab649bc 100644
--- a/vumeter.cpp
+++ b/vumeter.cpp
@@ -17,15 +17,16 @@ void VUMeter::paintEvent(QPaintEvent *event)
 
 	painter.fillRect(0, 0, width(), height(), Qt::black);
 
-	float level;
+	float level_lufs;
 	{
 		unique_lock<mutex> lock(level_mutex);
-		level = this->level;
+		level_lufs = this->level_lufs;
 	}
 
-	const float min_level = 0.0f;    // y=0 is top of screen, so “min” is the loudest level.
-	const float max_level = -60.0f; 
-	int y = lrintf(height() * (level - min_level) / (max_level - min_level));
+	float level_lu = level_lufs + 23.0f;
+	const float min_level = 18.0f;    // y=0 is top of screen, so “min” is the loudest level.
+	const float max_level = -36.0f;
+	int y = lrintf(height() * (level_lu - min_level) / (max_level - min_level));
 	if (y >= 0 && y < height()) {
 		painter.setPen(Qt::white);
 		painter.drawLine(0, y, width(), y);
diff --git a/vumeter.h b/vumeter.h
index de27529..f9be292 100644
--- a/vumeter.h
+++ b/vumeter.h
@@ -13,9 +13,9 @@ class VUMeter : public QWidget
 public:
 	VUMeter(QWidget *parent);
 
-	void set_level(float level) {
+	void set_level(float level_lufs) {
 		std::unique_lock<std::mutex> lock(level_mutex);
-		this->level = level;
+		this->level_lufs = level_lufs;
 		update();
 	}
 
@@ -23,7 +23,7 @@ private:
 	void paintEvent(QPaintEvent *event) override;
 
 	std::mutex level_mutex;
-	float level = -HUGE_VAL;
+	float level_lufs = -HUGE_VAL;
 };
 
 extern VUMeter *global_vu_meter;