Merge pull request #22 from Trinitou/update-helpers-host-proxy

Update helpers
free-audio · Oct 16, 2023 · 71f3071 · 71f3071
2 parents f1e9be4 + 8e4f52d
commit 71f3071
Show file tree

Hide file tree

Showing 24 changed files with 27 additions and 27 deletions.
diff --git a/clap-helpers b/clap-helpers
diff --git a/plugins/clap-entry.cc b/plugins/clap-entry.cc
@@ -19,21 +19,21 @@
 #include "plugs/realtime-requirement/realtime-requirement.hh"
 
 struct PluginEntry {
-   using create_func = std::function<const clap_plugin *(const clap_host *)>;
+   using create_func = std::function<const clap_plugin *(const clap_host &)>;
 
    PluginEntry(const clap_plugin_descriptor *d, create_func &&func)
       : desc(d), create(std::move(func)) {}
 
    const clap_plugin_descriptor *desc;
-   std::function<const clap_plugin *(const clap_host *)> create;
+   std::function<const clap_plugin *(const clap_host &)> create;
 };
 
 static std::vector<PluginEntry> g_plugins;
 static std::string g_pluginPath;
 
 template <typename T>
 static void addPlugin() {
-   g_plugins.emplace_back(T::descriptor(), [](const clap_host *host) -> const clap_plugin * {
+   g_plugins.emplace_back(T::descriptor(), [](const clap_host &host) -> const clap_plugin * {
       auto plugin = new T(g_pluginPath, host);
       return plugin->clapPlugin();
    });
@@ -77,7 +77,7 @@ static const clap_plugin *
 clap_create_plugin(const clap_plugin_factory *, const clap_host *host, const char *plugin_id) {
    for (auto &entry : g_plugins)
       if (!strcmp(entry.desc->id, plugin_id))
-         return entry.create(host);
+         return entry.create(*host);
    return nullptr;
 }
 

diff --git a/plugins/core-plugin.cc b/plugins/core-plugin.cc
@@ -37,7 +37,7 @@ namespace clap {
 
    CorePlugin::CorePlugin(std::unique_ptr<PathProvider> &&pathProvider,
                           const clap_plugin_descriptor *desc,
-                          const clap_host *host)
+                          const clap_host &host)
       : Plugin(desc, host), _pathProvider(std::move(pathProvider)) {
       assert(_pathProvider);
    }

diff --git a/plugins/core-plugin.hh b/plugins/core-plugin.hh
@@ -42,7 +42,7 @@ namespace clap {
    public:
       CorePlugin(std::unique_ptr<PathProvider> &&pathProvider,
                  const clap_plugin_descriptor *desc,
-                 const clap_host *host);
+                 const clap_host &host);
       ~CorePlugin() override;
 
       const PathProvider &pathProvider() const noexcept { return *_pathProvider; }

diff --git a/plugins/plugs/adsr/adsr-plug.cc b/plugins/plugs/adsr/adsr-plug.cc
@@ -61,7 +61,7 @@ namespace clap {
       return &desc;
    }
 
-   AdsrPlug::AdsrPlug(const std::string &pluginPath, const clap_host *host)
+   AdsrPlug::AdsrPlug(const std::string &pluginPath, const clap_host &host)
       : CorePlugin(PathProvider::create(pluginPath, "AdsrPlug"), descriptor(), host) {
       _rootModule = std::make_unique<AdsrPlugModule>(*this);
    }

diff --git a/plugins/plugs/adsr/adsr-plug.hh b/plugins/plugs/adsr/adsr-plug.hh
@@ -9,7 +9,7 @@ namespace clap {
       using super = CorePlugin;
 
    public:
-      AdsrPlug(const std::string &pluginPath, const clap_host *host);
+      AdsrPlug(const std::string &pluginPath, const clap_host &host);
 
       static const clap_plugin_descriptor *descriptor();
 

diff --git a/plugins/plugs/char-check/char-check.cc b/plugins/plugs/char-check/char-check.cc
@@ -36,7 +36,7 @@ namespace clap {
       return &desc;
    }
 
-   CharCheck::CharCheck(const std::string &pluginPath, const clap_host *host)
+   CharCheck::CharCheck(const std::string &pluginPath, const clap_host &host)
       : CorePlugin(PathProvider::create(pluginPath, "char-check"), descriptor(), host) {
       _rootModule = std::make_unique<CharCheckModule>(*this);
 

diff --git a/plugins/plugs/char-check/char-check.hh b/plugins/plugs/char-check/char-check.hh
@@ -8,7 +8,7 @@ namespace clap {
       using super = CorePlugin;
 
    public:
-      CharCheck(const std::string &pluginPath, const clap_host *host);
+      CharCheck(const std::string &pluginPath, const clap_host &host);
 
       static const clap_plugin_descriptor *descriptor();
 

diff --git a/plugins/plugs/dc-offset/dc-offset.cc b/plugins/plugs/dc-offset/dc-offset.cc
@@ -47,7 +47,7 @@ namespace clap {
       return &desc;
    }
 
-   DcOffset::DcOffset(const std::string &pluginPath, const clap_host *host)
+   DcOffset::DcOffset(const std::string &pluginPath, const clap_host &host)
       : CorePlugin(PathProvider::create(pluginPath, "dc-offset"), descriptor(), host) {
       _rootModule = std::make_unique<DcOffsetModule>(*this);
    }

diff --git a/plugins/plugs/dc-offset/dc-offset.hh b/plugins/plugs/dc-offset/dc-offset.hh
@@ -8,7 +8,7 @@ namespace clap {
       using super = CorePlugin;
 
    public:
-      DcOffset(const std::string& pluginPath, const clap_host *host);
+      DcOffset(const std::string& pluginPath, const clap_host &host);
 
       static const clap_plugin_descriptor *descriptor();
 

diff --git a/plugins/plugs/gain/gain.cc b/plugins/plugs/gain/gain.cc
@@ -52,7 +52,7 @@ namespace clap {
       kParamIdGain = 0,
    };
 
-   Gain::Gain(const std::string &pluginPath, const clap_host *host)
+   Gain::Gain(const std::string &pluginPath, const clap_host &host)
       : CorePlugin(PathProvider::create(pluginPath, "gain"), descriptor(), host) {
       _rootModule = std::make_unique<GainModule>(*this);
    }

diff --git a/plugins/plugs/gain/gain.hh b/plugins/plugs/gain/gain.hh
@@ -8,7 +8,7 @@ namespace clap {
       using super = CorePlugin;
 
    public:
-      Gain(const std::string &pluginPath, const clap_host *host);
+      Gain(const std::string &pluginPath, const clap_host &host);
 
       static const clap_plugin_descriptor *descriptor();
 

diff --git a/plugins/plugs/latency/latency.cc b/plugins/plugs/latency/latency.cc
@@ -52,7 +52,7 @@ namespace clap {
       return &desc;
    }
 
-   Latency::Latency(const std::string &pluginPath, const clap_host *host)
+   Latency::Latency(const std::string &pluginPath, const clap_host &host)
       : CorePlugin(PathProvider::create(pluginPath, "Latency"), descriptor(), host) {
       _rootModule = std::make_unique<LatencyModule>(*this);
    }

diff --git a/plugins/plugs/latency/latency.hh b/plugins/plugs/latency/latency.hh
@@ -8,7 +8,7 @@ namespace clap {
       using super = CorePlugin;
 
    public:
-      Latency(const std::string &pluginPath, const clap_host *host);
+      Latency(const std::string &pluginPath, const clap_host &host);
 
       static const clap_plugin_descriptor *descriptor();
 

diff --git a/plugins/plugs/offline-latency/offline-latency.cc b/plugins/plugs/offline-latency/offline-latency.cc
@@ -53,7 +53,7 @@ namespace clap {
       return &desc;
    }
 
-   OfflineLatency::OfflineLatency(const std::string &pluginPath, const clap_host *host)
+   OfflineLatency::OfflineLatency(const std::string &pluginPath, const clap_host &host)
       : CorePlugin(PathProvider::create(pluginPath, "Offline Latency"), descriptor(), host) {
       _rootModule = std::make_unique<OfflineLatencyModule>(*this);
    }

diff --git a/plugins/plugs/offline-latency/offline-latency.hh b/plugins/plugs/offline-latency/offline-latency.hh
@@ -8,7 +8,7 @@ namespace clap {
       using super = CorePlugin;
 
    public:
-      OfflineLatency(const std::string &pluginPath, const clap_host *host);
+      OfflineLatency(const std::string &pluginPath, const clap_host &host);
 
       static const clap_plugin_descriptor *descriptor();
 

diff --git a/plugins/plugs/realtime-requirement/realtime-requirement.cc b/plugins/plugs/realtime-requirement/realtime-requirement.cc
@@ -43,7 +43,7 @@ namespace clap {
       return &desc;
    }
 
-   RealtimeRequirement::RealtimeRequirement(const std::string &pluginPath, const clap_host *host)
+   RealtimeRequirement::RealtimeRequirement(const std::string &pluginPath, const clap_host &host)
       : CorePlugin(PathProvider::create(pluginPath, "Offline Latency"), descriptor(), host) {
       _rootModule = std::make_unique<RealtimeRequirementModule>(*this);
    }

diff --git a/plugins/plugs/realtime-requirement/realtime-requirement.hh b/plugins/plugs/realtime-requirement/realtime-requirement.hh
@@ -8,7 +8,7 @@ namespace clap {
       using super = CorePlugin;
 
    public:
-      RealtimeRequirement(const std::string &pluginPath, const clap_host *host);
+      RealtimeRequirement(const std::string &pluginPath, const clap_host &host);
 
       static const clap_plugin_descriptor *descriptor();
 

diff --git a/plugins/plugs/svf/svf-plug.cc b/plugins/plugs/svf/svf-plug.cc
@@ -52,7 +52,7 @@ namespace clap {
       return &desc;
    }
 
-   SvfPlug::SvfPlug(const std::string &pluginPath, const clap_host *host)
+   SvfPlug::SvfPlug(const std::string &pluginPath, const clap_host &host)
       : CorePlugin(PathProvider::create(pluginPath, "svf"), descriptor(), host) {
       _rootModule = std::make_unique<SvfPlugModule>(*this);
    }

diff --git a/plugins/plugs/svf/svf-plug.hh b/plugins/plugs/svf/svf-plug.hh
@@ -8,7 +8,7 @@ namespace clap {
       using super = CorePlugin;
 
    public:
-      SvfPlug(const std::string &pluginPath, const clap_host *host);
+      SvfPlug(const std::string &pluginPath, const clap_host &host);
 
       static const clap_plugin_descriptor *descriptor();
 

diff --git a/plugins/plugs/synth/synth.cc b/plugins/plugs/synth/synth.cc
@@ -222,7 +222,7 @@ namespace clap {
       return &desc;
    }
 
-   Synth::Synth(const std::string &pluginPath, const clap_host *host)
+   Synth::Synth(const std::string &pluginPath, const clap_host &host)
       : CorePlugin(PathProvider::create(pluginPath, "synth"), descriptor(), host) {
       _rootModule = std::make_unique<SynthModule>(*this);
    }

diff --git a/plugins/plugs/synth/synth.hh b/plugins/plugs/synth/synth.hh
@@ -8,7 +8,7 @@ namespace clap {
       using super = CorePlugin;
 
    public:
-      Synth(const std::string &pluginPath, const clap_host *host);
+      Synth(const std::string &pluginPath, const clap_host &host);
 
       static const clap_plugin_descriptor *descriptor();
 

diff --git a/plugins/plugs/transport/transport-info.cc b/plugins/plugs/transport/transport-info.cc
@@ -34,7 +34,7 @@ namespace clap {
       kParamIdOffset = 0,
    };
 
-   TransportInfo::TransportInfo(const std::string &pluginPath, const clap_host *host)
+   TransportInfo::TransportInfo(const std::string &pluginPath, const clap_host &host)
       : CorePlugin(PathProvider::create(pluginPath, "transport-info"), descriptor(), host) {
       _rootModule = std::make_unique<TransportInfoModule>(*this);
    }

diff --git a/plugins/plugs/transport/transport-info.hh b/plugins/plugs/transport/transport-info.hh
@@ -8,7 +8,7 @@ namespace clap {
       using super = CorePlugin;
 
    public:
-      TransportInfo(const std::string& pluginPath, const clap_host *host);
+      TransportInfo(const std::string& pluginPath, const clap_host &host);
 
       static const clap_plugin_descriptor *descriptor();
    };
+7 −10		include/clap/helpers/host-proxy.hh
+10 −13		include/clap/helpers/host-proxy.hxx
+143 −17		include/clap/helpers/plugin-proxy.hh
+579 −0		include/clap/helpers/plugin-proxy.hxx
+1 −1		include/clap/helpers/plugin.hh
+1 −1		include/clap/helpers/plugin.hxx