Make reference level of VUMeter and LRAMeter adjustable.

[nageru] / vumeter.cpp

diff --git a/vumeter.cpp b/vumeter.cpp
index 0049edfc6f029fbf539c9b57115614a4efbd086c..c7f8df467ab3681900205d35fdedbfe115846fbc 100644 (file)
--- a/vumeter.cpp
+++ b/vumeter.cpp
@@ -1,57 +1,46 @@
 #include <QPainter>
 
 #include "vumeter.h"
+#include "vu_common.h"
 
 using namespace std;
 
-namespace {
-
-int lufs_to_pos(float level_lu, int height)
+VUMeter::VUMeter(QWidget *parent)
+       : QWidget(parent)
 {
-       const float min_level = 9.0f;    // y=0 is top of screen, so “min” is the loudest level.
-       const float max_level = -18.0f;
-       int y = lrintf(height * (level_lu - min_level) / (max_level - min_level));
-       y = std::max(y, 0);
-       y = std::min(y, height - 1);
-       return y;
 }
 
-}  // namespace
-
-VUMeter *global_vu_meter = nullptr;
-QLabel *global_peak_display = 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);
-
-       // 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, Qt::darkGray);
-               }
-       }
-
        float level_lufs;
        {
                unique_lock<mutex> lock(level_mutex);
                level_lufs = this->level_lufs;
        }
 
-       float level_lu = level_lufs + 23.0f;
-       int y = lufs_to_pos(level_lu, height());
-       painter.fillRect(0, y, width(), 2, Qt::white);
+       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);
+}
+
+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);
+
+       off_pixmap = QPixmap(width(), height());
+       QPainter off_painter(&off_pixmap);
+       draw_vu_meter(off_painter, width(), height(), 0, false, min_level, max_level);
 }