Re-run IWYU, again with lots of manual cleanup.

[nageru] / lrameter.cpp

diff --git a/lrameter.cpp b/lrameter.cpp
index 7f7aaf1cd672de81a60920b427c68fe7726b9c1f..6e9fed429a5862563c79144424acd2d0a70e2ff7 100644 (file)
--- a/lrameter.cpp
+++ b/lrameter.cpp
@@ -1,8 +1,12 @@
-#include <QPainter>
-
 #include "lrameter.h"
+
+#include <QPainter>
+#include <QPalette>
+#include <QPen>
 #include "vu_common.h"
 
+class QPaintEvent;
+
 using namespace std;
 
 LRAMeter::LRAMeter(QWidget *parent)
@@ -17,16 +21,23 @@ void LRAMeter::paintEvent(QPaintEvent *event)
        painter.fillRect(0, 0, width(), height(), parentWidget()->palette().window());
 
        float level_lufs;
+       float range_low_lufs;
+       float range_high_lufs;
        {
                unique_lock<mutex> lock(level_mutex);
                level_lufs = this->level_lufs;
+               range_low_lufs = this->range_low_lufs;
+               range_high_lufs = this->range_high_lufs;
        }
 
        float level_lu = level_lufs + 23.0f;
+       float range_low_lu = range_low_lufs + 23.0f;
+       float range_high_lu = range_high_lufs + 23.0f;
        const int margin = 5;
-       draw_vu_meter(painter, level_lu, width(), height(), margin);
+       draw_vu_meter(painter, range_low_lu, range_high_lu, width(), height(), margin);
 
        // Draw the target area (+/-1 LU is allowed EBU range).
+       // It turns green when we're within.
        int min_y = lufs_to_pos(1.0f, height());
        int max_y = lufs_to_pos(-1.0f, height());
 
@@ -48,4 +59,24 @@ void LRAMeter::paintEvent(QPaintEvent *event)
                painter.setPen(pen);
                painter.drawRect(2, min_y, width() - 5, max_y - min_y);
        }
+
+       // Draw the integrated loudness meter, in the same color as the target area.
+       int y = lufs_to_pos(level_lu, height());
+       {
+               QPen pen(Qt::black);
+               pen.setWidth(5);
+               painter.setPen(pen);
+               painter.drawRect(2, y, width() - 5, 1);
+       }
+       {
+               QPen pen;
+               if (level_lu >= -1.0f && level_lu <= 1.0f) {
+                       pen.setColor(Qt::green);
+               } else {
+                       pen.setColor(Qt::red);
+               }
+               pen.setWidth(3);
+               painter.setPen(pen);
+               painter.drawRect(2, y, width() - 5, 1);
+       }
 }