X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=vumeter.cpp;h=ab40fceff699ec13df3f3db1c86eefdbd73ed3bf;hb=9c824f7164eeecaa1aa904d69c5bb64fb3a6a27b;hp=03a93e7ba4fd52476978cdb3759bce2a9b417b29;hpb=24e4026778bfd87612d5bedce1bfa51455853bc3;p=nageru

diff --git a/vumeter.cpp b/vumeter.cpp
index 03a93e7..ab40fce 100644
--- a/vumeter.cpp
+++ b/vumeter.cpp
@@ -1,11 +1,10 @@
 #include <QPainter>
 
 #include "vumeter.h"
+#include "vu_common.h"
 
 using namespace std;
 
-VUMeter *global_vu_meter = nullptr;
-
 VUMeter::VUMeter(QWidget *parent)
 	: QWidget(parent)
 {
@@ -15,19 +14,12 @@ void VUMeter::paintEvent(QPaintEvent *event)
 {
 	QPainter painter(this);
 
-	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));
-	if (y >= 0 && y < height()) {
-		painter.setPen(Qt::white);
-		painter.drawLine(0, y, width(), y);
-	}
+	float level_lu = level_lufs + 23.0f;
+	draw_vu_meter(painter, -HUGE_VAL, level_lu, width(), height(), 0);
 }