Cleanup

Signed-off-by: falkTX <falktx@falktx.com>
DISTRHO · Aug 16, 2021 · 8e36c1a · 8e36c1a
1 parent d5fa6c9
commit 8e36c1a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 25 deletions.
diff --git a/plugins/common/FloatFifo.hpp b/plugins/common/FloatFifo.hpp
@@ -44,12 +44,6 @@ struct FloatFifo {
       Increments when writing.
     */
     uint32_t writePosition;
-
-   /**
-      Counters used to track available space.
-      TODO get rid of these
-    */
-    uint32_t readCounter, writeCounter;
 };
 
 // -----------------------------------------------------------------------
@@ -105,18 +99,9 @@ class FloatFifoControl
     // -------------------------------------------------------------------
     // check operations
 
-    inline uint32_t readSpace() const noexcept
-    {
-        DISTRHO_SAFE_ASSERT_RETURN(fifoPtr != nullptr, 0);
-
-        return fifoPtr->writeCounter - fifoPtr->readCounter;
-    }
-
-    inline uint32_t writeSpace() const noexcept
+    inline bool canRead() const noexcept
     {
-        DISTRHO_SAFE_ASSERT_RETURN(fifoPtr != nullptr, 0);
-
-        return numSamples - readSpace();
+        return fifoPtr != nullptr && fifoPtr->readPosition != fifoPtr->writePosition;
     }
 
     // -------------------------------------------------------------------
@@ -131,7 +116,6 @@ class FloatFifoControl
         DISTRHO_SAFE_ASSERT_RETURN(fifoPtr != nullptr,);
 
         fifoPtr->readPosition = fifoPtr->writePosition = 0;
-        fifoPtr->readCounter = fifoPtr->writeCounter = 0;
         std::memset(fifoPtr->buffer, 0, sizeof(float)*numSamples);
     }
 
@@ -165,7 +149,6 @@ class FloatFifoControl
         if (++readPosition == numSamples)
             readPosition = 0;
 
-        ++fifoPtr->readCounter;
         fifoPtr->readPosition = readPosition;
         return ret;
     }
@@ -184,7 +167,6 @@ class FloatFifoControl
         if (++writePosition == numSamples)
             writePosition = 0;
 
-        ++fifoPtr->writeCounter;
         fifoPtr->writePosition = writePosition;
     }
 

diff --git a/plugins/common/OneKnobPlugin.hpp b/plugins/common/OneKnobPlugin.hpp
@@ -84,7 +84,7 @@ class OneKnobPlugin : public Plugin
         {
             if (lineGraphsData.isCreatedOrConnected())
             {
-                DISTRHO_SAFE_ASSERT_RETURN(! lineGraphActive,);
+                DISTRHO_SAFE_ASSERT(! lineGraphActive);
                 lineGraphIn.setFloatFifo(nullptr);
                 lineGraphOut.setFloatFifo(nullptr);
                 lineGraphsData.close();

diff --git a/plugins/common/OneKnobUI.hpp b/plugins/common/OneKnobUI.hpp
@@ -264,19 +264,19 @@ class OneKnobUI : public UI,
     {
         bool shouldRepaint = false;
 
-        if (lineGraphIn.readSpace() != 0)
+        if (lineGraphIn.canRead())
         {
             float value = lineGraphIn.read();
-            if (lineGraphIn.readSpace() != 0)
+            if (lineGraphIn.canRead())
                 value = lineGraphIn.read();
             pushInputMeter(value);
             shouldRepaint = true;
         }
 
-        if (lineGraphOut.readSpace() != 0)
+        if (lineGraphOut.canRead())
         {
             float value = lineGraphOut.read();
-            if (lineGraphOut.readSpace() != 0)
+            if (lineGraphOut.canRead())
                 value = lineGraphOut.read();
             pushOutputMeter(value);
             shouldRepaint = true;