Add markings, max inverted after threshold reached

Also some cleanup, and bumped to version 1.5.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 17a096ab4c8ba692b1bc6901052e72e1f74508bb..03e3a7331dc6473ad8efb176bf41b17aff2e558a 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.0)
 
-project(MeterForPulseAudio VERSION 1.4)
+project(MeterForPulseAudio VERSION 1.5)
 
 set(MeterForPulseAudio_SOURCES
     GameDevTools/src/GDT/GameLoop.cpp

diff --git a/Changelog.md b/Changelog.md
index 983de32dad9ecbf2e9cf990c71632a9744103f67..0263f3889036875ee60cb0e858fde0a918f0455e 100644 (file)
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,10 @@
+# Version 1.5
+
+Color of previous max amount in meter is inverted after a certain threshold
+(0.98).  
+Add markings on meter (can be disabled in program arguments).  
+Minor cleanup.
+
 # Version 1.4
 
 Fix bug involving channel size.

diff --git a/src/Main.cpp b/src/Main.cpp
index 4c45a2e7cbeeede1a628a6ea0209a83b21a1396b..47b273a5a80c5a463ea926a2641bf3c60386ab0e 100644 (file)
--- a/src/Main.cpp
+++ b/src/Main.cpp
@@ -14,6 +14,7 @@ int main(int argc, char** argv)
     bool isSink = true;
     unsigned int framerateLimit = 60;
     sf::Color color(sf::Color::Green);
+    bool hideMarkings = false;
 
     ADP::AnotherDangParser parser;
     parser.addLongOptionFlag(
@@ -101,6 +102,11 @@ int main(int argc, char** argv)
             std::exit(0);
         },
         "Lists available PulseAudio sources");
+    parser.addLongFlag("hide-markings",
+        [&hideMarkings] () {
+            hideMarkings = true;
+        },
+        "Hides the markings on the meter (default not hidden)");
     parser.addFlag(
         "h",
         [&parser] () {
@@ -117,7 +123,12 @@ int main(int argc, char** argv)
         return 1;
     }
 
-    MfPA::Meter meter(sinkOrSourceName.c_str(), isSink, framerateLimit, color);
+    MfPA::Meter meter(
+        sinkOrSourceName.c_str(),
+        isSink,
+        framerateLimit,
+        color,
+        hideMarkings);
     meter.startMainLoop();
 
     return 0;

diff --git a/src/MfPA/Meter.cpp b/src/MfPA/Meter.cpp
index 7f37f6a0debb439bcd5c1ebea933540a0a2ca606..1d5d4c0392f713896a5ca132655a0ef4a8ad7507 100644 (file)
--- a/src/MfPA/Meter.cpp
+++ b/src/MfPA/Meter.cpp
@@ -11,7 +11,8 @@ MfPA::Meter::Meter(
     const char* sinkOrSourceName,
     bool isSink,
     unsigned int framerateLimit,
-    sf::Color barColor
+    sf::Color barColor,
+    bool hideMarkings
 ) :
 currentState(WAITING),
 isMonitoringSink(isSink),
@@ -26,10 +27,29 @@ runFlag(true),
 channels(1),
 channelsChanged(true),
 window(sf::VideoMode(100,400), "Meter for PulseAudio"),
-barColor(barColor)
+barColor(barColor),
+inverted(~barColor.r, ~barColor.g, ~barColor.b),
+varray(sf::PrimitiveType::Lines, 2),
+hideMarkings(hideMarkings)
 {
     window.setView(sf::View(sf::FloatRect(0.0f, 0.0f, 1.0f, 1.0f)));
     bar.setFillColor(barColor);
+    if((int)inverted.r + (int)inverted.g + (int)inverted.b < 75)
+    {
+        inverted.r += (255 - inverted.r) / 1.4;
+        inverted.g += (255 - inverted.g) / 1.4;
+        inverted.b += (255 - inverted.b) / 1.4;
+    }
+    varray[0].color = sf::Color(barColor.r, ~barColor.g, ~barColor.b);
+    if((int)varray[0].color.r
+        + (int)varray[0].color.g
+        + (int)varray[0].color.b < 75)
+    {
+        varray[0].color.r += (255 - varray[0].color.r) / 1.4;
+        varray[0].color.g += (255 - varray[0].color.g) / 1.4;
+        varray[0].color.b += (255 - varray[0].color.b) / 1.4;
+    }
+    varray[1].color = varray[0].color;
 
     setenv("PULSE_PROP_application.name", "Meter for PulseAudio", 1);
     setenv("PULSE_PROP_application.icon_name", "multimedia-volume-control", 1);
@@ -349,6 +369,13 @@ void MfPA::Meter::startMainLoop()
         1.0f / 120.0f);
 }
 
+MfPA::Meter::Level::Level() :
+main(0.0f),
+prev(0.0f),
+prevTimer(0.0f),
+changed(false)
+{}
+
 void MfPA::Meter::update(float dt)
 {
     pa_mainloop_iterate(mainLoop, 0, nullptr);
@@ -372,15 +399,13 @@ void MfPA::Meter::update(float dt)
 
     if(channelsChanged)
     {
-        levels.resize(channels, 0.0f);
-        prevLevels.resize(channels, std::make_tuple(0.0f, 0.0f));
-        levelsChanged.resize(channels, false);
+        levels.resize(channels);
         channelsChanged = false;
     }
 
     for(unsigned int i = 0; i < channels; ++i)
     {
-        levelsChanged[i] = false;
+        levels[i].changed = false;
     }
 
     while(!sampleQueue.empty())
@@ -391,15 +416,15 @@ void MfPA::Meter::update(float dt)
             {
                 float fabs = std::abs(front[i]);
                 unsigned char currentChannel = i % channels;
-                if(levels[currentChannel] < fabs)
+                if(levels[currentChannel].main < fabs)
                 {
-                    levels[currentChannel] = fabs;
-                    levelsChanged[currentChannel] = true;
+                    levels[currentChannel].main = fabs;
+                    levels[currentChannel].changed = true;
                 }
-                if(std::get<0>(prevLevels[currentChannel]) < fabs)
+                if(levels[currentChannel].prev <= fabs)
                 {
-                    std::get<0>(prevLevels[currentChannel]) = fabs;
-                    std::get<1>(prevLevels[currentChannel]) = 1.0f;
+                    levels[currentChannel].prev = fabs;
+                    levels[currentChannel].prevTimer = 1.0f;
                 }
             }
         }
@@ -408,21 +433,21 @@ void MfPA::Meter::update(float dt)
 
     for(unsigned int i = 0; i < channels; ++i)
     {
-        if(!levelsChanged[i])
+        if(!levels[i].changed)
         {
-            levels[i] -= METER_DECAY_RATE * dt;
-            if(levels[i] < 0.0f)
+            levels[i].main -= METER_DECAY_RATE * dt;
+            if(levels[i].main < 0.0f)
             {
-                levels[i] = 0.0f;
+                levels[i].main = 0.0f;
             }
         }
-        if(std::get<1>(prevLevels[i]) > 0.0f)
+        if(levels[i].prevTimer > 0.0f)
         {
-            std::get<1>(prevLevels[i]) -= METER_PREV_DECAY_RATE * dt;
-            if(std::get<1>(prevLevels[i]) <= 0.0f)
+            levels[i].prevTimer -= METER_PREV_DECAY_RATE * dt;
+            if(levels[i].prevTimer <= 0.0f)
             {
-                std::get<0>(prevLevels[i]) = 0.0f;
-                std::get<1>(prevLevels[i]) = 0.0f;
+                levels[i].prev = 0.0f;
+                levels[i].prevTimer = 0.0f;
             }
         }
     }
@@ -433,8 +458,8 @@ void MfPA::Meter::update(float dt)
     {
         for(unsigned int i = 0; i < channels; ++i)
         {
-            std::cout << "[" << i << "] " << levels[i] << "_"
-                << std::get<0>(prevLevels[i]) << " ";
+            std::cout << "[" << i << "] " << levels[i].main << "_"
+                << levels[i].prev << " ";
         }
         std::cout << std::endl;
         levelsPrintTimer = 1.0f;
@@ -446,31 +471,60 @@ void MfPA::Meter::draw()
 {
     window.clear();
 
+    // don't draw until containers have been resized to channel amount
     if(!channelsChanged)
-    { // don't draw until containers have been resized to channel amount
+    {
         for(unsigned int i = 0; i < channels; ++i)
         {
             // prev levels
-            barColor.a = 255 * std::get<1>(prevLevels[i]);
-            bar.setFillColor(barColor);
+            if(levels[i].prev >= METER_UPPER_LIMIT)
+            {
+                inverted.a = 255 * levels[i].prevTimer;
+                bar.setFillColor(inverted);
+            }
+            else
+            {
+                barColor.a = 255 * levels[i].prevTimer;
+                bar.setFillColor(barColor);
+                barColor.a = 255;
+            }
             bar.setSize(sf::Vector2f(
                 1.0f / (float)channels,
-                std::get<0>(prevLevels[i])));
+                levels[i].prev));
             bar.setPosition(sf::Vector2f(
                 (float)i * 1.0f / (float)channels,
-                1.0f - std::get<0>(prevLevels[i])));
+                1.0f - levels[i].prev));
             window.draw(bar);
             // levels
-            barColor.a = 255;
             bar.setFillColor(barColor);
             bar.setSize(sf::Vector2f(
                 1.0f / (float)channels,
-                levels[i]));
+                levels[i].main));
             bar.setPosition(sf::Vector2f(
                 (float)i * 1.0f / (float)channels,
-                1.0f - levels[i]));
+                1.0f - levels[i].main));
             window.draw(bar);
         }
+
+        if(!hideMarkings)
+        {
+            // draw lines at 0.75, 0.5, 0.25, and METER_UPPER_LIMIT
+            varray[0].position = sf::Vector2f(0.0f, 1.0f - METER_UPPER_LIMIT);
+            varray[1].position = sf::Vector2f(1.0f, 1.0f - METER_UPPER_LIMIT);
+            window.draw(varray);
+
+            varray[0].position = sf::Vector2f(0.0f, 0.25f);
+            varray[1].position = sf::Vector2f(1.0f, 0.25f);
+            window.draw(varray);
+
+            varray[0].position = sf::Vector2f(0.0f, 0.5f);
+            varray[1].position = sf::Vector2f(1.0f, 0.5f);
+            window.draw(varray);
+
+            varray[0].position = sf::Vector2f(0.0f, 0.75f);
+            varray[1].position = sf::Vector2f(1.0f, 0.75f);
+            window.draw(varray);
+        }
     }
 
     window.display();

diff --git a/src/MfPA/Meter.hpp b/src/MfPA/Meter.hpp
index 28b30675832a70e31da35a98c324ce6547dd1bbd..5ac0a86d2a5c95d1eaf81724ca13a8e4064b2889 100644 (file)
--- a/src/MfPA/Meter.hpp
+++ b/src/MfPA/Meter.hpp
@@ -3,6 +3,7 @@
 
 #define METER_DECAY_RATE 2.0f
 #define METER_PREV_DECAY_RATE 1.0f
+#define METER_UPPER_LIMIT 0.98f
 
 #include <queue>
 #include <vector>
@@ -21,7 +22,8 @@ public:
         const char* sinkOrSourceName = "",
         bool isSink = true,
         unsigned int framerateLimit = 0,
-        sf::Color barColor = sf::Color::Green
+        sf::Color barColor = sf::Color::Green,
+        bool hideMarkings = false
     );
     ~Meter();
 
@@ -83,13 +85,26 @@ private:
 
     unsigned char channels;
     bool channelsChanged;
-    std::vector<float> levels;
-    std::vector<std::tuple<float, float>> prevLevels;
-    std::vector<bool> levelsChanged;
+
+    struct Level
+    {
+        Level();
+
+        float main;
+        float prev;
+        float prevTimer;
+        bool changed;
+    };
+
+    std::vector<Level> levels;
 
     sf::RenderWindow window;
     sf::RectangleShape bar;
     sf::Color barColor;
+    sf::Color inverted;
+    sf::VertexArray varray;
+
+    bool hideMarkings;
 
 #ifndef NDEBUG
     float levelsPrintTimer;