X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=vumeter.cpp;h=ab40fceff699ec13df3f3db1c86eefdbd73ed3bf;hb=ab13c66602322b5a6e840126986c1e7014edc125;hp=27ffc5ae5a6b0c86eb14f0f218b7baa59552c1b0;hpb=54bf3bae3d72dfce0f0517e1c82926ef22aad028;p=nageru

diff --git a/vumeter.cpp b/vumeter.cpp
index 27ffc5a..ab40fce 100644
--- a/vumeter.cpp
+++ b/vumeter.cpp
@@ -1,25 +1,10 @@
 #include <QPainter>
 
 #include "vumeter.h"
+#include "vu_common.h"
 
 using namespace std;
 
-namespace {
-
-int lufs_to_pos(float level_lu, int height)
-{
-	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));
-	y = std::max(y, 0);
-	y = std::min(y, height - 1);
-	return y;
-}
-
-}  // namespace
-
-VUMeter *global_vu_meter = nullptr;
-
 VUMeter::VUMeter(QWidget *parent)
 	: QWidget(parent)
 {
@@ -29,12 +14,6 @@ void VUMeter::paintEvent(QPaintEvent *event)
 {
 	QPainter painter(this);
 
-	painter.fillRect(0, 0, width(), height(), Qt::black);
-
-	int min_y = lufs_to_pos(1.0f, height());
-	int max_y = lufs_to_pos(-1.0f, height());
-	painter.fillRect(0, min_y, width(), max_y - min_y, Qt::green);
-
 	float level_lufs;
 	{
 		unique_lock<mutex> lock(level_mutex);
@@ -42,7 +21,5 @@ void VUMeter::paintEvent(QPaintEvent *event)
 	}
 
 	float level_lu = level_lufs + 23.0f;
-	int y = lufs_to_pos(level_lu, height());
-	painter.setPen(Qt::white);
-	painter.drawLine(0, y, width(), y);
+	draw_vu_meter(painter, -HUGE_VAL, level_lu, width(), height(), 0);
 }