X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=vumeter.cpp;h=08ac1da684c3c479b5c58a4759fdb25e8602d51a;hb=b90b0d462921973c88952ca82f8d3dbc53e046df;hp=9fca7ddc1c8712e5c214ff9b4bda313caf73018d;hpb=3376a2309e8b682f8e8d0a96bbda9ccaa19c53c0;p=nageru

diff --git a/vumeter.cpp b/vumeter.cpp
index 9fca7dd..08ac1da 100644
--- a/vumeter.cpp
+++ b/vumeter.cpp
@@ -12,13 +12,7 @@ VUMeter::VUMeter(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);
+	recalculate_pixmaps();
 }
 
 void VUMeter::paintEvent(QPaintEvent *event)
@@ -31,11 +25,31 @@ void VUMeter::paintEvent(QPaintEvent *event)
 		level_lufs = this->level_lufs;
 	}
 
-	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);
+	float level_lu = level_lufs - ref_level_lufs;
+	int on_pos = lrint(lufs_to_pos(level_lu, height()));
+
+	if (flip) {
+		QRect on_rect(0, 0, width(), height() - on_pos);
+		QRect off_rect(0, height() - on_pos, width(), height());
+
+		painter.drawPixmap(on_rect, on_pixmap, on_rect);
+		painter.drawPixmap(off_rect, off_pixmap, off_rect);
+	} else {
+		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);
+	}
+}
+
+void VUMeter::recalculate_pixmaps()
+{
+	on_pixmap = QPixmap(width(), height());
+	QPainter on_painter(&on_pixmap);
+	draw_vu_meter(on_painter, width(), height(), 0, true, min_level, max_level, flip);
 
-	painter.drawPixmap(off_rect, off_pixmap, off_rect);
-	painter.drawPixmap(on_rect, on_pixmap, on_rect);
+	off_pixmap = QPixmap(width(), height());
+	QPainter off_painter(&off_pixmap);
+	draw_vu_meter(off_painter, width(), height(), 0, false, min_level, max_level, flip);
 }