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

[nageru] / vumeter.cpp

diff --git a/vumeter.cpp b/vumeter.cpp
index c08e9dcd3f02ead70b39fd7165657b31c8fa1f63..08ac1da684c3c479b5c58a4759fdb25e8602d51a 100644 (file)
--- a/vumeter.cpp
+++ b/vumeter.cpp
@@ -25,22 +25,31 @@ void VUMeter::paintEvent(QPaintEvent *event)
                level_lufs = this->level_lufs;
        }
 
-       float level_lu = level_lufs + 23.0f;
+       float level_lu = level_lufs - ref_level_lufs;
        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);
 
-       painter.drawPixmap(off_rect, off_pixmap, off_rect);
-       painter.drawPixmap(on_rect, on_pixmap, on_rect);
+       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);
+       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);
+       draw_vu_meter(off_painter, width(), height(), 0, false, min_level, max_level, flip);
 }