Rework the LRA and VU meters into something much more like LRA and VU meters.

[nageru] / vumeter.cpp

diff --git a/vumeter.cpp b/vumeter.cpp
index da93c1e380732535c18ee38d038e2c9996184fe0..ab40fceff699ec13df3f3db1c86eefdbd73ed3bf 100644 (file)
--- a/vumeter.cpp
+++ b/vumeter.cpp
@@ -14,21 +14,6 @@ void VUMeter::paintEvent(QPaintEvent *event)
 {
        QPainter painter(this);
 
-       painter.fillRect(0, 0, width(), height(), Qt::black);
-
-       // Draw some reference bars.
-       for (int level = -18; level < 9; ++level) {
-               int min_y = lufs_to_pos(level, height()) - 1;
-               int max_y = lufs_to_pos(level + 1.0f, height()) + 1;
-
-               // Recommended range is 0 LU +/- 1 LU.
-               if (level == -1 || level == 0) {
-                       painter.fillRect(1, min_y, width() - 2, max_y - min_y, Qt::green);
-               } else {
-                       painter.fillRect(1, min_y, width() - 2, max_y - min_y, QColor(80, 80, 80));
-               }
-       }
-
        float level_lufs;
        {
                unique_lock<mutex> lock(level_mutex);
@@ -36,6 +21,5 @@ void VUMeter::paintEvent(QPaintEvent *event)
        }
 
        float level_lu = level_lufs + 23.0f;
-       int y = lufs_to_pos(level_lu, height());
-       painter.fillRect(0, y, width(), 2, Qt::white);
+       draw_vu_meter(painter, -HUGE_VAL, level_lu, width(), height(), 0);
 }