X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=vumeter.cpp;h=b697a834da3876533c06db888c16a42e8f209067;hb=327534a3031a332423411c9599c741f2f81657df;hp=c08e9dcd3f02ead70b39fd7165657b31c8fa1f63;hpb=bf8537f35000b8385ae806c15d8524c20f9c6fda;p=nageru

diff --git a/vumeter.cpp b/vumeter.cpp
index c08e9dc..b697a83 100644
--- a/vumeter.cpp
+++ b/vumeter.cpp
@@ -1,8 +1,12 @@
-#include <QPainter>
-
 #include "vumeter.h"
+
+#include <QPainter>
+#include <QRect>
 #include "vu_common.h"
 
+class QPaintEvent;
+class QResizeEvent;
+
 using namespace std;
 
 VUMeter::VUMeter(QWidget *parent)
@@ -19,28 +23,54 @@ void VUMeter::paintEvent(QPaintEvent *event)
 {
 	QPainter painter(this);
 
-	float level_lufs;
+	float level_lufs[2], peak_lufs[2];
 	{
 		unique_lock<mutex> lock(level_mutex);
-		level_lufs = this->level_lufs;
+		level_lufs[0] = this->level_lufs[0];
+		level_lufs[1] = this->level_lufs[1];
+		peak_lufs[0] = this->peak_lufs[0];
+		peak_lufs[1] = this->peak_lufs[1];
 	}
 
-	float level_lu = level_lufs + 23.0f;
-	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);
+	int mid = width() / 2;
+
+	for (unsigned channel = 0; channel < 2; ++channel) {
+		int left = (channel == 0) ? 0 : mid;
+		int right = (channel == 0) ? mid : width();
+		float level_lu = level_lufs[channel] - ref_level_lufs;
+		int on_pos = lrint(lufs_to_pos(level_lu, height()));
 
-	painter.drawPixmap(off_rect, off_pixmap, off_rect);
-	painter.drawPixmap(on_rect, on_pixmap, on_rect);
+		QRect off_rect(left, 0, right - left, on_pos);
+		QRect on_rect(left, on_pos, right - left, height() - on_pos);
+
+		painter.drawPixmap(off_rect, off_pixmap, off_rect);
+		painter.drawPixmap(on_rect, on_pixmap, on_rect);
+
+		float peak_lu = peak_lufs[channel] - ref_level_lufs;
+		if (peak_lu >= min_level && peak_lu <= max_level) {
+			int peak_pos = lrint(lufs_to_pos(peak_lu, height()));
+			QRect peak_rect(left, peak_pos - 1, right, 2);
+			painter.drawPixmap(peak_rect, full_on_pixmap, peak_rect);
+		}
+	}
 }
 
 void VUMeter::recalculate_pixmaps()
 {
+	full_on_pixmap = QPixmap(width(), height());
+	QPainter full_on_painter(&full_on_pixmap);
+	full_on_painter.fillRect(0, 0, width(), height(), parentWidget()->palette().window());
+	draw_vu_meter(full_on_painter, width(), height(), 0, 0.0, true, min_level, max_level, /*flip=*/false);
+
+	float margin = 0.5 * (width() - 20);
+
 	on_pixmap = QPixmap(width(), height());
 	QPainter on_painter(&on_pixmap);
-	draw_vu_meter(on_painter, width(), height(), 0, true, min_level, max_level);
+	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);
-	draw_vu_meter(off_painter, width(), height(), 0, false, min_level, max_level);
+	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);
 }