Replace the R128 meters for each channel with a digital peak meter.

[nageru] / vumeter.cpp

diff --git a/vumeter.cpp b/vumeter.cpp
index 08ac1da684c3c479b5c58a4759fdb25e8602d51a..2bf36390206a59a18622d59f205c19769fb81a28 100644 (file)
--- a/vumeter.cpp
+++ b/vumeter.cpp
@@ -19,37 +19,57 @@ 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 - ref_level_lufs;
-       int on_pos = lrint(lufs_to_pos(level_lu, height()));
+       int mid = width() / 2;
 
-       if (flip) {
-               QRect on_rect(0, 0, width(), height() - on_pos);
-               QRect off_rect(0, height() - on_pos, width(), height());
+       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(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);
+               if (flip) {
+                       QRect on_rect(left, 0, right - left, height() - on_pos);
+                       QRect off_rect(left, height() - on_pos, right - left, height());
 
-               painter.drawPixmap(off_rect, off_pixmap, off_rect);
-               painter.drawPixmap(on_rect, on_pixmap, on_rect);
+                       painter.drawPixmap(on_rect, on_pixmap, on_rect);
+                       painter.drawPixmap(off_rect, off_pixmap, off_rect);
+               } else {
+                       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);
+       draw_vu_meter(full_on_painter, width(), height(), 0, 0.0, true, min_level, max_level, flip);
+
        on_pixmap = QPixmap(width(), height());
        QPainter on_painter(&on_pixmap);
-       draw_vu_meter(on_painter, width(), height(), 0, true, min_level, max_level, flip);
+       draw_vu_meter(on_painter, width(), height(), 0, 2.0, true, min_level, max_level, flip);
 
        off_pixmap = QPixmap(width(), height());
        QPainter off_painter(&off_pixmap);
-       draw_vu_meter(off_painter, width(), height(), 0, false, min_level, max_level, flip);
+       draw_vu_meter(off_painter, width(), height(), 0, 2.0, false, min_level, max_level, flip);
 }