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

diff --git a/vumeter.cpp b/vumeter.cpp
index 03a93e7..9fca7dd 100644
--- a/vumeter.cpp
+++ b/vumeter.cpp
@@ -1,33 +1,41 @@
 #include <QPainter>
 
 #include "vumeter.h"
+#include "vu_common.h"
 
 using namespace std;
 
-VUMeter *global_vu_meter = 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, -HUGE_VAL, HUGE_VAL, width(), height(), 0);
+
+	off_pixmap = QPixmap(width(), height());
+	QPainter off_painter(&off_pixmap);
+	draw_vu_meter(off_painter, -HUGE_VAL, -HUGE_VAL, width(), height(), 0);
+}
+
 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;
+	int on_pos = 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);
 }