0.14.3

Author: atkAudioUser

CMakePresets.json

@@ -144,13 +144,6 @@
       "description": "Windows build for x64",
       "configuration": "Debug"
     },
-    {
-      "name": "windows-x64-release",
-      "configurePreset": "windows-x64",
-      "displayName": "Windows x64 Release",
-      "description": "Windows build for x64 (Release configuration)",
-      "configuration": "Release"
-    },
     {
       "name": "windows-ci-x64",
       "configurePreset": "windows-ci-x64",

README.md

@@ -1,13 +1,15 @@
 # atkAudio Plugin for OBS
 
 ## Plugin Host
+
 - VST3 plugin host for OBS
 - Up to 8 channels
 - Sidechain support
 - AU plugins on Apple macOS
 - LADSPA and LV2 plugins on Linux
 
 ## Plugin Host2
+
 - Build filter graphs (plugin chains) with multiple plugin instances
 - Saving and loading of filter graphs as files
 - MIDI support (e.g. for using MIDI keyboard and a sampler plugin as soundboard)
@@ -16,29 +18,35 @@
 Plugin Host2 can interface directly with audio and MIDI hardware, OBS audio sources, and output audio as new OBS sources, allowing for complex audio processing setups. E.g. use ASIO interface as audio device, take additional audio from OBS sources, route monitoring to ASIO outputs and/or different audio drivers/hardware, use plugins and create final mix, and output the processed audio as a new OBS source for recording and streaming. Or just create a simple soundboard with a sampler plugin and a MIDI keyboard.
 
 ## Device I/O
+
 - Send and receive audio directly into and from audio devices
 - "Anything from/to anywhere" device routing
 - ASIO, CoreAudio and Windows Audio devices
 - Resampling and drift correction
 
 ## Audio Source Mixer (OBS Source)
+
 - Mix audio from up to 8 OBS sources into a new OBS audio source
 - E.g. allows creating new submixes
-- Can be used as 'dummy' source to host Device IO 
+- Can be used as 'dummy' source to host Device IO
 
 ## Installation
+
 - Download and install [latest release](https://github.com/atkAudio/PluginForObsRelease/releases/latest)
 - Manual/portable installations: extract `.dll|.dylib|.so` from installer and copy it to OBS plugins directory. For example on major Linux distros, extract `atkaudio-pluginforobs.so` from `.deb` file and copy it to `~/.config/obs-studio/plugins/atkaudio-pluginforobs/bin/64bit/`
 
 ## Build instructions
+
 Project is based on [OBS Plugin Template](https://github.com/obsproject/obs-plugintemplate) and depends on [JUCE Framework](https://github.com/juce-framework/JUCE). Install JUCE Framework [Minimum System Requirements](https://github.com/juce-framework/JUCE#minimum-system-requirements) and OBS Plugin Template [Supported Build Environment](https://github.com/obsproject/obs-plugintemplate#supported-build-environments) and follow OBS Plugin Template [Quick Start Guide](https://github.com/obsproject/obs-plugintemplate/wiki/Quick-Start-Guide).
 
 In short, after installing all dependencies (Ubuntu example):
-```
+
+```console
 git clone https://github.com/atkaudio/pluginforobsrelease
 cd pluginforobsrelease
 cmake --preset ubuntu-x86_64
 cmake --build --preset ubuntu-x86_64 
 ```
-Find `atkaudio-pluginforobs.so` and copy it to OBS plugins directory. 
+
+Find `atkaudio-pluginforobs.so` and copy it to OBS plugins directory.
 See `CMakePresets.json` for Windows, macOS and other build presets.

buildspec.json

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

lib/atkaudio/src/atkaudio/DeviceIo/DeviceIoApp.h

@@ -52,15 +52,15 @@ class DeviceIoApp final : public AudioAppComponent
         if (inputChannels > 0)
             toObsBuffer.write(
                 bufferToFill.buffer->getArrayOfReadPointers(),
-                bufferToFill.buffer->getNumChannels(),
+                inputChannels,
                 bufferToFill.numSamples,
                 sampleRate
             );
 
         if (outputChannels > 0)
             fromObsBuffer.read(
                 bufferToFill.buffer->getArrayOfWritePointers(),
-                bufferToFill.buffer->getNumChannels(),
+                outputChannels,
                 bufferToFill.numSamples,
                 sampleRate
             );

lib/atkaudio/src/atkaudio/FifoBuffer2.h

@@ -27,15 +27,15 @@ class FifoBuffer2 : public juce::Timer
         juce::ScopedLock lock2(readLock);
 
         fifo.reset();
-        auto freeSpace = fifo.getFreeSpace();
+        auto fifoTotalSize = fifo.getTotalSize();
 
-        if (freeSpace < (int)std::ceil(minBufferSize))
-            freeSpace = 2 * freeSpace;
+        if (fifoTotalSize < minBufferSize + 1)
+            fifoTotalSize = 2 * minBufferSize;
 
         if (buffer.getNumChannels() < minNumChannels)
             minNumChannels = 2 * minNumChannels;
 
-        setSize(minNumChannels, freeSpace);
+        setSize(minNumChannels, fifoTotalSize);
 
         isPrepared.store(true, std::memory_order_release);
     }
@@ -139,14 +139,31 @@ class FifoBuffer2 : public juce::Timer
         }
 
         if (advanceRead)
-            fifo.finishedRead(readCount);
+            this->advanceRead(readCount);
 
         return readCount;
     }
 
     void advanceRead(int numSamples)
     {
-        fifo.finishedRead(numSamples);
+        int start1, size1, start2, size2;
+        int readCount = 0;
+        fifo.prepareToRead(numSamples, start1, size1, start2, size2);
+        if (size1 > 0)
+        {
+            for (int ch = 0; ch < buffer.getNumChannels(); ++ch)
+                std::memset(buffer.getWritePointer(ch, start1), 0, sizeof(float) * size1);
+
+            readCount += size1;
+        }
+        if (size2 > 0)
+        {
+            for (int ch = 0; ch < buffer.getNumChannels(); ++ch)
+                std::memset(buffer.getWritePointer(ch, start2), 0, sizeof(float) * size2);
+
+            readCount += size2;
+        }
+        fifo.finishedRead(readCount);
     }
 
     auto& getBuffer()
@@ -168,8 +185,12 @@ class FifoBuffer2 : public juce::Timer
 
     void setSize(int numChannels, int numSamples)
     {
-        buffer.setSize(numChannels, numSamples + 1, false, false, true);
-        fifo.setTotalSize(numSamples + 1);
+        numSamples = numSamples > 16384 ? numSamples : 16384; // minimum size
+        if (buffer.getNumSamples() < numSamples + 1)
+            buffer.setSize(numChannels, numSamples + 1, false, false, true);
+
+        if (fifo.getTotalSize() < numSamples + 1)
+            fifo.setTotalSize(numSamples + 1);
         reset();
     }
 
@@ -323,6 +344,7 @@ class SyncBuffer : public juce::Timer
             for (int ch = 0; ch < numChannels; ++ch)
                 std::memset(dest[ch], 0, sizeof(float) * numSamples);
 
+        tempBuffer.clear();
         tempBuffer.setSize(numChannels, writerSamplesNeeded, false, false, true);
         auto writerSamples =
             fifoBuffer.read(tempBuffer.getArrayOfWritePointers(), numChannels, writerSamplesNeeded, false);
@@ -344,7 +366,7 @@ class SyncBuffer : public juce::Timer
         auto totalSamplesConsumed = 0;
 
         auto finalRatio = 0.0f;
-        for (int i = 0; i < interpolators.size(); i++)
+        for (int i = 0; i < numChannels; i++)
         {
             totalSamplesConsumed = 0;
             int samplesAvailable = writerSamples;