X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=vumeter.cpp;h=15240b4e5b9ac4ff552006d69b236e25b26ebcc6;hb=c015407a3953235df07a601baa6aa8e02ba7b561;hp=e56268ad46f0d6cddde59ba5d15b8134d9f411e7;hpb=8d0d68b7cca3a4c58268fa0822ca38bb1863dd19;p=nageru

diff --git a/vumeter.cpp b/vumeter.cpp
index e56268a..15240b4 100644
--- a/vumeter.cpp
+++ b/vumeter.cpp
@@ -1,41 +1,30 @@
 #include <QPainter>
 
 #include "vumeter.h"
+#include "vu_common.h"
 
 using namespace std;
 
-namespace {
-
-int lufs_to_pos(float level_lu, int height)
+VUMeter::VUMeter(QWidget *parent)
+	: QWidget(parent)
 {
-	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;
-QLabel *global_peak_display = nullptr;
-
-VUMeter::VUMeter(QWidget *parent)
-	: QWidget(parent)
+void VUMeter::resizeEvent(QResizeEvent *event)
 {
+	on_pixmap = QPixmap(width(), height());
+	QPainter on_painter(&on_pixmap);
+	draw_vu_meter(on_painter, width(), height(), 0, true);
+
+	off_pixmap = QPixmap(width(), height());
+	QPainter off_painter(&off_pixmap);
+	draw_vu_meter(off_painter, width(), height(), 0, false);
 }
 
 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);
@@ -43,7 +32,10 @@ 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);
+	int on_pos = lrint(lufs_to_pos(level_lu, height()));
+	QRect off_rect(0, 0, width(), on_pos);
+	QRect on_rect(0, on_pos, width(), height() - on_pos);
+
+	painter.drawPixmap(off_rect, off_pixmap, off_rect);
+	painter.drawPixmap(on_rect, on_pixmap, on_rect);
 }