Some refactoring of common VU functions.

[nageru] / vumeter.cpp

diff --git a/vumeter.cpp b/vumeter.cpp
index e377211fe1371c0abb2c28bec5b65ec14985119e..da93c1e380732535c18ee38d038e2c9996184fe0 100644 (file)
--- a/vumeter.cpp
+++ b/vumeter.cpp
@@ -1,29 +1,10 @@
 #include <QPainter>
 
 #include "vumeter.h"
+#include "vu_common.h"
 
 using namespace std;
 
-namespace {
-
-int lufs_to_pos(float level_lu, int height)
-{
-       const float min_level = 9.0f;    // y=0 is top of screen, so “min” is the loudest level.
-       const float max_level = -18.0f;
-
-       // Handle -inf.
-       if (level_lu < max_level) {
-               return height - 1;
-       }
-
-       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::VUMeter(QWidget *parent)
        : QWidget(parent)
 {