Remove an (easily-predictable) branch from the StereoCompressor inner loop.

[nageru] / vumeter.cpp

diff --git a/vumeter.cpp b/vumeter.cpp
index ab649bc792af8c74e3657f9986006125471d6f0c..08ac1da684c3c479b5c58a4759fdb25e8602d51a 100644 (file)
--- a/vumeter.cpp
+++ b/vumeter.cpp
@@ -1,34 +1,55 @@
 #include <QPainter>
 
 #include "vumeter.h"
+#include "vu_common.h"
 
 using namespace std;
 
-VUMeter *global_vu_meter = nullptr;
-
 VUMeter::VUMeter(QWidget *parent)
        : QWidget(parent)
 {
 }
 
+void VUMeter::resizeEvent(QResizeEvent *event)
+{
+       recalculate_pixmaps();
+}
+
 void VUMeter::paintEvent(QPaintEvent *event)
 {
        QPainter painter(this);
 
-       painter.fillRect(0, 0, width(), height(), Qt::black);
-
        float level_lufs;
        {
                unique_lock<mutex> lock(level_mutex);
                level_lufs = this->level_lufs;
        }
 
-       float level_lu = level_lufs + 23.0f;
-       const float min_level = 18.0f;    // y=0 is top of screen, so “min” is the loudest level.
-       const float max_level = -36.0f;
-       int y = lrintf(height() * (level_lu - min_level) / (max_level - min_level));
-       if (y >= 0 && y < height()) {
-               painter.setPen(Qt::white);
-               painter.drawLine(0, y, width(), y);
+       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);
+
+       off_pixmap = QPixmap(width(), height());
+       QPainter off_painter(&off_pixmap);
+       draw_vu_meter(off_painter, width(), height(), 0, false, min_level, max_level, flip);
+}