0.9.1

Author: atkAudioUser

CMakeLists.txt

@@ -48,6 +48,9 @@ add_subdirectory(lib/atkaudio)
 
 file(READ "${CMAKE_SOURCE_DIR}/buildspec.json" buildspec)
 string(JSON PLUGIN_DISPLAY_NAME GET ${buildspec} displayName)
+string(JSON PLUGIN_AUTHOR GET ${buildspec} author)
+string(TIMESTAMP PLUGIN_YEAR "%Y")
+set(PLUGIN_AUTHOR "${PLUGIN_AUTHOR}")
 
 configure_file(src/config.h.in config.h @ONLY)
 

LICENSE.md

@@ -1,13 +1,13 @@
 # License Information
 
 This repository uses multiple licenses:
-- **Main project:**  
+- **Main project**  
     [GNU General Public License v2.0 (GPL-2.0)](./LICENSE-GPL2)
 
-- **lib/atkaudio:**  
+- **lib/atkaudio**  
     [GNU General Public License v3.0 (GPL-3.0)](./LICENSE-GPL3)
 
-- **JUCE:**  
+- **JUCE**  
     [JUCE License](./LICENSE-JUCE.md)  
 
 Please review the individual license files and source headers for more information.

README.md

@@ -1,18 +1,25 @@
-# atkAudio Audio Plugin for OBS
+# 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.
+- 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)
+- etc
 
 ## 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.
+- 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' audio source to host Audio Device I/O input.
+- 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 

buildspec.json

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

lib/atkaudio/cmake/cpack.cmake

@@ -24,6 +24,7 @@ set(CPACK_NSIS_ENABLE_UNINSTALL_BEFORE_INSTALL ON)
 set(CPACK_NSIS_DISPLAY_NAME "${DISPLAYNAME}")
 set(CPACK_NSIS_UNINSTALL_NAME "Uninstall ${DISPLAYNAME}")
 set(CPACK_NSIS_INSTALL_ROOT "$COMMONPROGRAMDATA\\obs-studio\\plugins")
+set(CPACK_NSIS_BRANDING_TEXT " ")
 file(TO_NATIVE_PATH "${CPACK_NSIS_INSTALL_ROOT}" CPACK_NSIS_INSTALL_ROOT)
 string(REPLACE "\\" "\\\\" CPACK_NSIS_INSTALL_ROOT "${CPACK_NSIS_INSTALL_ROOT}")
 

lib/atkaudio/src/atkaudio/About.h

@@ -0,0 +1,30 @@
+#pragma once
+
+#include <config.h>
+#include <juce_audio_utils/juce_audio_utils.h>
+
+static inline void showAboutDialog()
+{
+    DialogWindow::LaunchOptions options;
+    auto& lookAndFeel = juce::LookAndFeel::getDefaultLookAndFeel();
+    options.dialogTitle = "About";
+    String aboutText;
+    aboutText << PLUGIN_DISPLAY_NAME << "\n"
+              << PLUGIN_VERSION << "\n\n"
+              << "Copyright (c) " << PLUGIN_YEAR << " " << PLUGIN_AUTHOR << "\n"
+              << "Licensed under AGPL3\n"
+              << "\n"
+              << "ASIO and VST are registered\n"
+              << "trademarks of Steinberg GmbH";
+    auto* label = new Label({}, aboutText);
+    label->setColour(Label::backgroundColourId, lookAndFeel.findColour(ResizableWindow::backgroundColourId));
+    label->setColour(Label::textColourId, lookAndFeel.findColour(Label::textColourId));
+    label->setJustificationType(Justification::centred);
+    label->setSize(250, 160);
+    options.content.setOwned(label);
+    options.useNativeTitleBar = false;
+    options.resizable = false;
+    options.escapeKeyTriggersCloseButton = true;
+    options.dialogBackgroundColour = lookAndFeel.findColour(ResizableWindow::backgroundColourId);
+    options.launchAsync();
+}

lib/atkaudio/src/atkaudio/FifoBuffer2.h

@@ -48,7 +48,7 @@ class FifoBuffer2
         return written;
     }
 
-    int read(float* const* dest, int numChannels, int numSamples, bool advanceRead = true)
+    int read(float* const* dest, int numChannels, int numSamples, bool advanceRead = true, bool addToBuffer = false)
     {
         jassert(buffer.getNumSamples() >= numSamples);
         jassert(buffer.getNumChannels() >= numChannels);
@@ -60,14 +60,34 @@ class FifoBuffer2
 
         if (size1 > 0)
         {
-            for (int ch = 0; ch < numChannels && ch < buffer.getNumChannels(); ++ch)
-                std::memcpy(dest[ch], buffer.getReadPointer(ch, start1), sizeof(float) * size1);
+            if (addToBuffer)
+            {
+                for (int ch = 0; ch < numChannels && ch < buffer.getNumChannels(); ++ch)
+                    for (int i = 0; i < size1; ++i)
+                        dest[ch][readCount + i] += buffer.getReadPointer(ch, start1)[i];
+            }
+            else
+            {
+                for (int ch = 0; ch < numChannels && ch < buffer.getNumChannels(); ++ch)
+                    std::memcpy(dest[ch], buffer.getReadPointer(ch, start1), sizeof(float) * size1);
+            }
+
             readCount += size1;
         }
         if (size2 > 0)
         {
-            for (int ch = 0; ch < numChannels && ch < buffer.getNumChannels(); ++ch)
-                std::memcpy(dest[ch] + readCount, buffer.getReadPointer(ch, start2), sizeof(float) * size2);
+            if (addToBuffer)
+            {
+                for (int ch = 0; ch < numChannels && ch < buffer.getNumChannels(); ++ch)
+                    for (int i = 0; i < size2; ++i)
+                        dest[ch][readCount + i] += buffer.getReadPointer(ch, start2)[i];
+            }
+            else
+            {
+                for (int ch = 0; ch < numChannels && ch < buffer.getNumChannels(); ++ch)
+                    std::memcpy(dest[ch] + readCount, buffer.getReadPointer(ch, start2), sizeof(float) * size2);
+            }
+
             readCount += size2;
         }
 
@@ -251,9 +271,9 @@ class SyncBuffer : public juce::Timer
         if (maxAvailable < samplesNeeded)
             return 0;
 
-#if defined(JUCE_DEBUG) && defined(JUCE_WINDOWS)
-        DBG(ratio);
-#endif
+        // #if defined(JUCE_DEBUG) && defined(JUCE_WINDOWS)
+        //         DBG(ratio);
+        // #endif
 
         auto samplesGot = fifoBuffer.read(tempBuffer.getArrayOfWritePointers(), numChannels, samplesNeeded, false);
 

lib/atkaudio/src/atkaudio/PluginHost2.h

@@ -19,7 +19,7 @@ class PluginHost2
     void getState(std::string& s);
     void setState(std::string& s);
 
-    void initialise(int numInputChannels, int numOutputChannels, double sampleRate);
+    void initialise(int numInputChannels, int numOutputChannels, double sampleRate, void* obs_parent_source = nullptr);
 
 private:
     struct Impl;