0.11.0

Author: atkAudioUser

CMakePresets.json

@@ -128,7 +128,7 @@
       "configurePreset": "macos",
       "displayName": "macOS Universal",
       "description": "macOS build for Universal architectures",
-      "configuration": "RelWithDebInfo"
+      "configuration": "Debug"
     },
     {
       "name": "macos-ci",

buildspec.json

@@ -43,6 +43,6 @@
   "uuids": {
     "windowsApp": "ad885c58-5ca9-44de-8f4f-1c12676626a9"
   },
-  "version": "0.9.1",
+  "version": "0.11.0",
   "website": "https://www.atkaudio.com"
 }

lib/atkaudio/src/atkaudio/DeviceIo/DeviceIo.cpp

@@ -1,4 +1,4 @@
-#include "../DeviceIo.h"
+#include "DeviceIo.h"
 
 #include "DeviceIoApp.h"
 

lib/atkaudio/src/atkaudio/DeviceIo.h …tkaudio/src/atkaudio/DeviceIo/DeviceIo.hlib/atkaudio/src/atkaudio/DeviceIo.h renamed to lib/atkaudio/src/atkaudio/DeviceIo/DeviceIo.h lib/atkaudio/src/atkaudio/DeviceIo.h renamed to lib/atkaudio/src/atkaudio/DeviceIo/DeviceIo.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "atkaudio.h"
+#include "../atkaudio.h"
 
 #include <string>
 

lib/atkaudio/src/atkaudio/FifoBuffer2.h

@@ -6,26 +6,57 @@
 #define ATK_RATE_FACTOR 1.001f
 #define ATK_SMOOTHING_SPEED 1.0f
 
-class FifoBuffer2
+class FifoBuffer2 : public juce::Timer
 {
 public:
     FifoBuffer2()
-        : buffer()
-        , fifo(1)
+        : minNumChannels(2)
+        , minBufferSize(2048)
+        , buffer(minNumChannels, minBufferSize + 1)
+        , fifo(minBufferSize + 1)
     {
+        timerCallback();
+        startTimer(100);
     }
 
-    void setSize(int numChannels, int numSamples)
+    void timerCallback() override
     {
-        buffer.setSize(numChannels, numSamples, false, false, true);
-        fifo.setTotalSize(numSamples);
-        this->reset();
+        if (isPrepared.load(std::memory_order_acquire))
+            return;
+
+        juce::ScopedLock lock1(writeLock);
+        juce::ScopedLock lock2(readLock);
+
+        fifo.reset();
+        auto freeSpace = fifo.getFreeSpace();
+
+        if (freeSpace < minBufferSize)
+            freeSpace = 2 * freeSpace;
+
+        if (buffer.getNumChannels() < minNumChannels)
+            minNumChannels = 2 * minNumChannels;
+
+        setSize(minNumChannels, freeSpace);
+
+        isPrepared.store(true, std::memory_order_release);
     }
 
     int write(const float* const* src, int numChannels, int numSamples)
     {
-        jassert(buffer.getNumSamples() >= numSamples);
-        jassert(buffer.getNumChannels() >= numChannels);
+        juce::ScopedLock lock(writeLock);
+
+        if (minBufferSize < numSamples || minNumChannels < numChannels)
+        {
+            isPrepared.store(false, std::memory_order_release);
+
+            minBufferSize = std::max(minBufferSize, numSamples);
+            minNumChannels = std::max(minNumChannels, numChannels);
+        }
+
+        if (!isPrepared.load(std::memory_order_acquire))
+            return 0;
+
+        numChannels = std::min(numChannels, buffer.getNumChannels());
 
         int start1, size1, start2, size2;
         int written = 0;
@@ -44,15 +75,27 @@ class FifoBuffer2
             written += size2;
         }
 
+        // jassert(written == numSamples);
+
         fifo.finishedWrite(written);
         return written;
     }
 
     int read(float* const* dest, int numChannels, int numSamples, bool advanceRead = true, bool addToBuffer = false)
     {
-        jassert(buffer.getNumSamples() >= numSamples);
-        jassert(buffer.getNumChannels() >= numChannels);
-        jassert(fifo.getNumReady() >= numSamples);
+        juce::ScopedLock lock(readLock);
+        if (minBufferSize < numSamples || minNumChannels < numChannels)
+        {
+            isPrepared.store(false, std::memory_order_release);
+
+            minBufferSize = std::max(minBufferSize, numSamples);
+            minNumChannels = std::max(minNumChannels, numChannels);
+        }
+
+        if (!isPrepared.load(std::memory_order_acquire))
+            return 0;
+
+        numChannels = std::min(numChannels, buffer.getNumChannels());
 
         int start1, size1, start2, size2;
         int readCount = 0;
@@ -91,8 +134,6 @@ class FifoBuffer2
             readCount += size2;
         }
 
-        jassert(readCount == numSamples);
-
         if (advanceRead)
             fifo.finishedRead(readCount);
 
@@ -114,12 +155,6 @@ class FifoBuffer2
         return fifo.getFreeSpace();
     }
 
-    void reset()
-    {
-        buffer.clear();
-        fifo.reset();
-    }
-
     auto& getBuffer()
     {
         return buffer;
@@ -131,8 +166,29 @@ class FifoBuffer2
     }
 
 private:
+    void reset()
+    {
+        buffer.clear();
+        fifo.reset();
+    }
+
+    void setSize(int numChannels, int numSamples)
+    {
+        buffer.setSize(numChannels, numSamples + 1, false, false, true);
+        fifo.setTotalSize(numSamples + 1);
+        reset();
+    }
+
+private:
+    int minBufferSize;
+    int minNumChannels;
+
     juce::AudioBuffer<float> buffer;
     juce::AbstractFifo fifo;
+
+    juce::CriticalSection writeLock;
+    juce::CriticalSection readLock;
+    std::atomic_bool isPrepared{false};
 };
 
 class SyncBuffer : public juce::Timer
@@ -143,7 +199,7 @@ class SyncBuffer : public juce::Timer
         , readerBufferSize(-1)
         , writerBufferSize(-1)
     {
-        startTimerHz(60);
+        startTimer(100);
     }
 
     void timerCallback() override
@@ -194,17 +250,13 @@ class SyncBuffer : public juce::Timer
 
         tempBuffer.setSize(numChannels, 2 * maxBufferSize, false, false, true);
 
-        fifoBuffer.setSize(numChannels, 2 * maxBufferSize);
-
         rateSmoothing.reset(
             readerSampleRate.load(std::memory_order_acquire) / readerBufferSize.load(std::memory_order_acquire) * 1.0,
             ATK_SMOOTHING_SPEED
         );
         rateSmoothing.setCurrentAndTargetValue(1.0);
 
         tempBuffer.clear();
-        for (int ch = 0; ch < numChannels; ++ch)
-            tempBuffer.clear(ch, 0, minBufferSize);
         fifoBuffer.write(tempBuffer.getArrayOfWritePointers(), numChannels, minBufferSize);
 
         isPrepared.store(true, std::memory_order_release);
@@ -268,12 +320,16 @@ class SyncBuffer : public juce::Timer
 
         int samplesNeeded = std::ceil(numSamples * ratio);
 
+        if (!addToBuffer)
+            for (int ch = 0; ch < numChannels; ++ch)
+                std::memset(dest[ch], 0, sizeof(float) * numSamples);
+
+#ifdef JUCE_DEBUG
         if (maxAvailable < samplesNeeded)
-            return 0;
+            DBG("needed " << samplesNeeded << " available " << maxAvailable << " ratio " << ratio);
+#endif
 
-        // #if defined(JUCE_DEBUG) && defined(JUCE_WINDOWS)
-        //         DBG(ratio);
-        // #endif
+        tempBuffer.setSize(numChannels, samplesNeeded, false, false, true);
 
         auto samplesGot = fifoBuffer.read(tempBuffer.getArrayOfWritePointers(), numChannels, samplesNeeded, false);
 
@@ -282,25 +338,15 @@ class SyncBuffer : public juce::Timer
         for (int i = 0; i < interpolators.size(); i++)
         {
             auto ch = i % numChannels;
-            if (addToBuffer || ch >= interpolators.size())
-                samplesConsumed = interpolators[i].processAdding(
-                    ratio,
-                    tempBuffer.getReadPointer(ch),
-                    dest[ch],
-                    numSamples,
-                    maxAvailable,
-                    maxAvailable,
-                    1.0f
-                );
-            else
-                samplesConsumed = interpolators[i].process(
-                    ratio,
-                    tempBuffer.getReadPointer(ch),
-                    dest[ch],
-                    numSamples,
-                    maxAvailable,
-                    maxAvailable
-                );
+            samplesConsumed = interpolators[i].processAdding(
+                ratio,
+                tempBuffer.getReadPointer(ch),
+                dest[ch],
+                numSamples,
+                maxAvailable,
+                maxAvailable,
+                1.0f
+            );
         }
 
         fifoBuffer.advanceRead(samplesConsumed);
@@ -347,7 +393,6 @@ class SyncBuffer : public juce::Timer
     std::vector<juce::LagrangeInterpolator> interpolators;
 
     juce::AudioBuffer<float> tempBuffer;
-    // std::vector<float*> tempPtrs;
 
     std::atomic<int> readerBufferSize;
     std::atomic<int> writerBufferSize;
@@ -364,7 +409,4 @@ class SyncBuffer : public juce::Timer
 
     juce::CriticalSection readLock;
     juce::CriticalSection writeLock;
-
-    // std::atomic_bool isReading = false;
-    // std::atomic_bool isWriting = false;
 };

lib/atkaudio/src/atkaudio/PluginHost/PluginHost.cpp

@@ -1,4 +1,4 @@
-#include "../PluginHost.h"
+#include "PluginHost.h"
 
 #include "JuceHostPlugin.h"
 #include "StandaloneFilterWindow.h"

lib/atkaudio/src/atkaudio/PluginHost.h …dio/src/atkaudio/PluginHost/PluginHost.hlib/atkaudio/src/atkaudio/PluginHost.h renamed to lib/atkaudio/src/atkaudio/PluginHost/PluginHost.h lib/atkaudio/src/atkaudio/PluginHost.h renamed to lib/atkaudio/src/atkaudio/PluginHost/PluginHost.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "atkaudio.h"
+#include "../atkaudio.h"
 
 #include <string>