X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=vumeter.cpp;h=9fca7ddc1c8712e5c214ff9b4bda313caf73018d;hb=b22d8d6b38d060ccc5dfa591712211caf9ca3968;hp=e377211fe1371c0abb2c28bec5b65ec14985119e;hpb=5367f6ca387be404d90abf8fb9283f8abba58c51;p=nageru

diff --git a/vumeter.cpp b/vumeter.cpp
index e377211..9fca7dd 100644
--- a/vumeter.cpp
+++ b/vumeter.cpp
@@ -1,53 +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 = 9.0f;    // y=0 is top of screen, so “min” is the loudest level.
-	const float max_level = -18.0f;
-
-	// Handle -inf.
-	if (level_lu < max_level) {
-		return height - 1;
-	}
-
-	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::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);
-
-	// Draw some reference bars.
-	for (int level = -18; level < 9; ++level) {
-		int min_y = lufs_to_pos(level, height()) - 1;
-		int max_y = lufs_to_pos(level + 1.0f, height()) + 1;
-
-		// Recommended range is 0 LU +/- 1 LU.
-		if (level == -1 || level == 0) {
-			painter.fillRect(1, min_y, width() - 2, max_y - min_y, Qt::green);
-		} else {
-			painter.fillRect(1, min_y, width() - 2, max_y - min_y, QColor(80, 80, 80));
-		}
-	}
-
 	float level_lufs;
 	{
 		unique_lock<mutex> lock(level_mutex);
@@ -55,6 +32,10 @@ void VUMeter::paintEvent(QPaintEvent *event)
 	}
 
 	float level_lu = level_lufs + 23.0f;
-	int y = lufs_to_pos(level_lu, height());
-	painter.fillRect(0, y, width(), 2, Qt::white);
+	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);
 }