X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=lrameter.cpp;h=62b4a9f923134b101f91254bdae5bff4398a88ed;hb=b9feb66845bf24465b7671ac9ff7a52b88f6032b;hp=7f7aaf1cd672de81a60920b427c68fe7726b9c1f;hpb=2489e27c559cece872818930a9aa6fbc9ead994d;p=nageru

diff --git a/lrameter.cpp b/lrameter.cpp
index 7f7aaf1..62b4a9f 100644
--- a/lrameter.cpp
+++ b/lrameter.cpp
@@ -1,8 +1,15 @@
+#include "lrameter.h"
+
 #include <QPainter>
+#include <QPalette>
+#include <QPen>
+#include <QRect>
 
-#include "lrameter.h"
 #include "vu_common.h"
 
+class QPaintEvent;
+class QResizeEvent;
+
 using namespace std;
 
 LRAMeter::LRAMeter(QWidget *parent)
@@ -10,25 +17,43 @@ LRAMeter::LRAMeter(QWidget *parent)
 {
 }
 
+void LRAMeter::resizeEvent(QResizeEvent *event)
+{
+	recalculate_pixmaps();
+}
+
 void LRAMeter::paintEvent(QPaintEvent *event)
 {
 	QPainter painter(this);
 
-	painter.fillRect(0, 0, width(), height(), parentWidget()->palette().window());
-
 	float level_lufs;
+	float range_low_lufs;
+	float range_high_lufs;
 	{
 		unique_lock<mutex> lock(level_mutex);
 		level_lufs = this->level_lufs;
+		range_low_lufs = this->range_low_lufs;
+		range_high_lufs = this->range_high_lufs;
 	}
 
-	float level_lu = level_lufs + 23.0f;
-	const int margin = 5;
-	draw_vu_meter(painter, level_lu, width(), height(), margin);
+	float level_lu = level_lufs - ref_level_lufs;
+	float range_low_lu = range_low_lufs - ref_level_lufs;
+	float range_high_lu = range_high_lufs - ref_level_lufs;
+	int range_low_pos = lrint(lufs_to_pos(range_low_lu, height()));
+	int range_high_pos = lrint(lufs_to_pos(range_high_lu, height()));
+
+	QRect top_off_rect(0, 0, width(), range_high_pos);
+	QRect on_rect(0, range_high_pos, width(), range_low_pos - range_high_pos);
+	QRect bottom_off_rect(0, range_low_pos, width(), height() - range_low_pos);
+
+	painter.drawPixmap(top_off_rect, off_pixmap, top_off_rect);
+	painter.drawPixmap(on_rect, on_pixmap, on_rect);
+	painter.drawPixmap(bottom_off_rect, off_pixmap, bottom_off_rect);
 
 	// Draw the target area (+/-1 LU is allowed EBU range).
-	int min_y = lufs_to_pos(1.0f, height());
-	int max_y = lufs_to_pos(-1.0f, height());
+	// It turns green when we're within.
+	int min_y = lrint(lufs_to_pos(1.0f, height()));
+	int max_y = lrint(lufs_to_pos(-1.0f, height()));
 
 	// FIXME: This outlining isn't so pretty.
 	{
@@ -48,4 +73,39 @@ void LRAMeter::paintEvent(QPaintEvent *event)
 		painter.setPen(pen);
 		painter.drawRect(2, min_y, width() - 5, max_y - min_y);
 	}
+
+	// Draw the integrated loudness meter, in the same color as the target area.
+	int y = lrint(lufs_to_pos(level_lu, height()));
+	{
+		QPen pen(Qt::black);
+		pen.setWidth(5);
+		painter.setPen(pen);
+		painter.drawRect(2, y, width() - 5, 1);
+	}
+	{
+		QPen pen;
+		if (level_lu >= -1.0f && level_lu <= 1.0f) {
+			pen.setColor(Qt::green);
+		} else {
+			pen.setColor(Qt::red);
+		}
+		pen.setWidth(3);
+		painter.setPen(pen);
+		painter.drawRect(2, y, width() - 5, 1);
+	}
+}
+
+void LRAMeter::recalculate_pixmaps()
+{
+	const int margin = 5;
+
+	on_pixmap = QPixmap(width(), height());
+	QPainter on_painter(&on_pixmap);
+	on_painter.fillRect(0, 0, width(), height(), parentWidget()->palette().window());
+	draw_vu_meter(on_painter, width(), height(), margin, 2.0, true, min_level, max_level, /*flip=*/false);
+
+	off_pixmap = QPixmap(width(), height());
+	QPainter off_painter(&off_pixmap);
+	off_painter.fillRect(0, 0, width(), height(), parentWidget()->palette().window());
+	draw_vu_meter(off_painter, width(), height(), margin, 2.0, false, min_level, max_level, /*flip=*/false);
 }