Cleanup extension/capabilities interface

free-audio · Oct 15, 2023 · 782963a · 782963a
1 parent 91acf11
commit 782963a
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 21 deletions.
diff --git a/examples/GainPlugin/GainPlugin.cpp b/examples/GainPlugin/GainPlugin.cpp
@@ -15,7 +15,7 @@ GainPlugin::GainPlugin()
     gainDBParameter = dynamic_cast<ModulatableFloatParameter *>(vts.getParameter(gainParamTag));
 
     reaperPluginExtension =
-        static_cast<const reaper_plugin_info_t *>(extensionGet("cockos.reaper_extension"));
+        static_cast<const reaper_plugin_info_t *>(getExtension("cockos.reaper_extension"));
     jassert(reaperPluginExtension != nullptr || !juce::PluginHostType{}.isReaper());
 
     if (reaperPluginExtension != nullptr)

diff --git a/include/clap-juce-extensions/clap-juce-extensions.h b/include/clap-juce-extensions/clap-juce-extensions.h
@@ -18,6 +18,12 @@
 class ClapJuceWrapper;
 struct JUCEParameterVariant;
 
+namespace ClapAdapter
+{
+[[maybe_unused]] static const clap_plugin *clap_create_plugin(const struct clap_plugin_factory *,
+                                                              const clap_host *, const char *);
+}
+
 /** Forward declarations for any JUCE classes we might need. */
 namespace juce
 {
@@ -49,11 +55,6 @@ struct clap_properties
     // The processing and active clap state
     std::atomic<bool> is_clap_active{false}, is_clap_processing{false};
 
-    std::function<const void *(const char *)> extensionGet = extensionGetStatic;
-
-    // Internal implementation detail.
-    static std::function<const void *(const char *)> extensionGetStatic;
-
     // Internal implementation detail. Please disregard (and FIXME)
     static bool building_clap;
 };
@@ -276,12 +277,14 @@ struct clap_juce_audio_processor_capabilities
         return nullptr;
     }
 
-//    const void * getExtension(const char* name)
-//    {
-//        if (extensionGet)
-//            return extensionGet(name);
-//        return nullptr;
-//    }
+    const void *getExtension(const char *name)
+    {
+        if (clapHostStatic != nullptr)
+            return clapHostStatic->get_extension(clapHostStatic, name);
+        if (extensionGet)
+            return extensionGet(name);
+        return nullptr;
+    }
 
   private:
     friend class ::ClapJuceWrapper;
@@ -290,6 +293,11 @@ struct clap_juce_audio_processor_capabilities
     std::function<void()> noteNamesChangedSignal = nullptr;
     std::function<void()> remoteControlsChangedSignal = nullptr;
     std::function<void(uint32_t)> suggestRemoteControlsPageSignal = nullptr;
+    std::function<const void *(const char *)> extensionGet = nullptr;
+
+    friend const clap_plugin *ClapAdapter::clap_create_plugin(const struct clap_plugin_factory *,
+                                                              const clap_host *, const char *);
+    static const clap_host *clapHostStatic;
 };
 
 /*

diff --git a/src/extensions/clap-juce-extensions.cpp b/src/extensions/clap-juce-extensions.cpp
@@ -9,8 +9,8 @@ namespace clap_juce_extensions
 bool clap_properties::building_clap{false};
 uint32_t clap_properties::clap_version_major{0}, clap_properties::clap_version_minor{0},
     clap_properties::clap_version_revision{0};
-std::function<const void *(const char *)> clap_properties::extensionGetStatic{nullptr};
 
 clap_properties::clap_properties() : is_clap{building_clap} {}
 
+const clap_host* clap_juce_audio_processor_capabilities::clapHostStatic{nullptr};
 } // namespace clap_juce_extensions
diff --git a/src/wrapper/clap-juce-wrapper.cpp b/src/wrapper/clap-juce-wrapper.cpp
@@ -434,10 +434,7 @@ class ClapJuceWrapper : public clap::helpers::Plugin<
                         _host.remoteControlsSuggestPage(pageID);
                 });
             };
-        }
-        if (processorAsClapProperties != nullptr)
-        {
-            processorAsClapProperties->extensionGet = [this](const char *name) {
+            processorAsClapExtensions->extensionGet = [this](const char *name) {
                 return _host.host()->get_extension(_host.host(), name);
             };
         }
@@ -2226,12 +2223,10 @@ static const clap_plugin *clap_create_plugin(const struct clap_plugin_factory *,
     clap_juce_extensions::clap_properties::clap_version_major = CLAP_VERSION_MAJOR;
     clap_juce_extensions::clap_properties::clap_version_minor = CLAP_VERSION_MINOR;
     clap_juce_extensions::clap_properties::clap_version_revision = CLAP_VERSION_REVISION;
-    clap_juce_extensions::clap_properties::extensionGetStatic = [host](const char *name) {
-        return host->get_extension(host, name);
-    };
+    clap_juce_extensions::clap_juce_audio_processor_capabilities::clapHostStatic = host;
     auto *const pluginInstance = ::createPluginFilter();
     clap_juce_extensions::clap_properties::building_clap = false;
-    clap_juce_extensions::clap_properties::extensionGetStatic = nullptr;
+    clap_juce_extensions::clap_juce_audio_processor_capabilities::clapHostStatic = nullptr;
     auto *wrapper = new ClapJuceWrapper(host, pluginInstance);
     return wrapper->clapPlugin();
 }