0.20.1

Author: atkAudioUser

CMakeLists.txt

@@ -49,6 +49,7 @@ 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(JSON PLUGIN_OBS_VERSION_REQUIRED GET ${buildspec} dependencies obs-studio version)
 string(TIMESTAMP PLUGIN_YEAR "%Y")
 set(PLUGIN_AUTHOR "${PLUGIN_AUTHOR}")
 

README.md

@@ -19,7 +19,7 @@
 
 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.
 
-Develop your own audio processing plugins and integrate them into `Plugin Host2` using the [JUCE framework](https://juce.com/) AudioProcessor class. See `InternalPlugins.cpp` how `GainPlugin` is loaded. See `GainPlugin.h` for implementation.
+Develop your own audio processing plugins and integrate them into `Plugin Host2` using the [JUCE framework](https://juce.com/) AudioProcessor class. See `InternalPlugins.cpp` how `GainPlugin` is loaded. See `GainPlugin.h` for implementation. Optionally include OBS headers to use the [OBS API](https://docs.obsproject.com/) for more advanced integration with [OBS Studio](https://obsproject.com/)
 
 ## Device I/O
 

buildspec.json

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

lib/atkaudio/src/atkaudio/PluginHost2/ObsOutput.h

@@ -38,6 +38,7 @@ class ObsOutputAudioProcessor : public juce::AudioProcessor
 
     ~ObsOutputAudioProcessor() override
     {
+        numInstances.fetch_sub(1, std::memory_order_acquire);
         if (privateSource)
         {
             obs_source_release(privateSource);
@@ -64,8 +65,8 @@ class ObsOutputAudioProcessor : public juce::AudioProcessor
 
         audioSourceData.frames = static_cast<uint32_t>(buffer.getNumSamples());
         audioSourceData.speakers = getMainBusNumInputChannels() <= MAX_AUDIO_CHANNELS
-                                       ? static_cast<enum speaker_layout>(getMainBusNumInputChannels())
-                                       : SPEAKERS_UNKNOWN;
+                                     ? static_cast<enum speaker_layout>(getMainBusNumInputChannels())
+                                     : SPEAKERS_UNKNOWN;
         audioSourceData.format = AUDIO_FORMAT_FLOAT_PLANAR;
         audioSourceData.samples_per_sec = static_cast<uint32_t>(getSampleRate());
         audioSourceData.timestamp = os_gettime_ns();
@@ -142,7 +143,7 @@ class ObsOutputAudioProcessor : public juce::AudioProcessor
     }
 
 private:
-    std::atomic_int numInstances{0};
+    static inline std::atomic_int numInstances{0};
     juce::AudioProcessorValueTreeState apvts;
 
     obs_source_t* privateSource = nullptr;

src/CompareVersionStrings.h

@@ -0,0 +1,41 @@
+#pragma once
+#include <sstream>
+#include <string>
+#include <vector>
+
+inline std::vector<int> TokenizeVersionString(const std::string& str)
+{
+    std::vector<int> tokens;
+    std::stringstream ss(str);
+    std::string item;
+    while (std::getline(ss, item, '.'))
+    {
+        try
+        {
+            tokens.push_back(std::stoi(item));
+        }
+        catch (const std::exception& e)
+        {
+            (void)e;
+            tokens.push_back(-1);
+        }
+    }
+    return tokens;
+}
+
+inline int CompareVersionStrings(const std::string& v1, const std::string& v2)
+{
+    auto p1 = TokenizeVersionString(v1);
+    auto p2 = TokenizeVersionString(v2);
+    size_t maxLen = std::max(p1.size(), p2.size());
+    p1.resize(maxLen, 0);
+    p2.resize(maxLen, 0);
+    for (size_t i = 0; i < maxLen; ++i)
+    {
+        if (p1[i] < p2[i])
+            return -1;
+        if (p1[i] > p2[i])
+            return 1;
+    }
+    return 0;
+}

src/config.h.in

@@ -4,4 +4,5 @@
 #define PLUGIN_VERSION "@CMAKE_PROJECT_VERSION@"
 #define PLUGIN_DISPLAY_NAME "@PLUGIN_DISPLAY_NAME@"
 #define PLUGIN_YEAR "@PLUGIN_YEAR@"
-#define PLUGIN_AUTHOR "@PLUGIN_AUTHOR@"
+#define PLUGIN_AUTHOR "@PLUGIN_AUTHOR@"
+#define PLUGIN_OBS_VERSION_REQUIRED "@PLUGIN_OBS_VERSION_REQUIRED@"

src/plugin-main.cpp

@@ -16,6 +16,7 @@ You should have received a copy of the GNU General Public License along
 with this program. If not, see <https://www.gnu.org/licenses/>
 */
 
+#include "CompareVersionStrings.h"
 #include "config.h"
 
 #include <atkaudio/atkaudio.h>
@@ -51,6 +52,20 @@ MessagePump* messagePump = nullptr;
 
 bool obs_module_load(void)
 {
+    std::string obsCurrentVersion = obs_get_version_string();
+    std::string requiredVersion = PLUGIN_OBS_VERSION_REQUIRED;
+
+    if (CompareVersionStrings(obsCurrentVersion, requiredVersion) < 0)
+    {
+        obs_log(
+            LOG_ERROR,
+            "Incompatible OBS version: %s (required: %s)",
+            obsCurrentVersion.c_str(),
+            requiredVersion.c_str()
+        );
+        return false;
+    }
+
     obs_log(LOG_INFO, "plugin loaded successfully (version %s)", plugin_version);
 
     atk::create();