mirror of
https://github.com/robbert-vdh/yabridge.git
synced 2026-05-09 20:29:10 +02:00
Store plugin and host extension struct pointers
This commit is contained in:
@@ -18,6 +18,12 @@
|
|||||||
|
|
||||||
#include "../clap.h"
|
#include "../clap.h"
|
||||||
|
|
||||||
|
ClapHostExtensions::ClapHostExtensions(const clap_host& host) noexcept
|
||||||
|
: audio_ports(static_cast<const clap_host_audio_ports_t*>(
|
||||||
|
host.get_extension(&host, CLAP_EXT_AUDIO_PORTS))) {}
|
||||||
|
|
||||||
|
ClapHostExtensions::ClapHostExtensions() noexcept {}
|
||||||
|
|
||||||
clap_plugin_proxy::clap_plugin_proxy(ClapPluginBridge& bridge,
|
clap_plugin_proxy::clap_plugin_proxy(ClapPluginBridge& bridge,
|
||||||
size_t instance_id,
|
size_t instance_id,
|
||||||
clap::plugin::Descriptor descriptor,
|
clap::plugin::Descriptor descriptor,
|
||||||
@@ -52,6 +58,12 @@ bool CLAP_ABI clap_plugin_proxy::plugin_init(const struct clap_plugin* plugin) {
|
|||||||
assert(plugin && plugin->plugin_data);
|
assert(plugin && plugin->plugin_data);
|
||||||
auto self = static_cast<clap_plugin_proxy*>(plugin->plugin_data);
|
auto self = static_cast<clap_plugin_proxy*>(plugin->plugin_data);
|
||||||
|
|
||||||
|
// At this point we are allowed to query the host for extension structs.
|
||||||
|
// We'll store pointers to the host's extensions vtables, and then send
|
||||||
|
// whether or not those extensions were supported as booleans to the Wine
|
||||||
|
// plugin host so it can expose the same interfaces there.
|
||||||
|
self->extensions_ = ClapHostExtensions(*self->host_);
|
||||||
|
|
||||||
const clap::plugin::InitResponse response =
|
const clap::plugin::InitResponse response =
|
||||||
self->bridge_.send_main_thread_message(
|
self->bridge_.send_main_thread_message(
|
||||||
clap::plugin::Init{.instance_id = self->instance_id(),
|
clap::plugin::Init{.instance_id = self->instance_id(),
|
||||||
|
|||||||
@@ -29,6 +29,29 @@
|
|||||||
// Forward declaration to avoid circular includes
|
// Forward declaration to avoid circular includes
|
||||||
class ClapPluginBridge;
|
class ClapPluginBridge;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Pointers to all of a CLAP host's extension structs. These will be null if the
|
||||||
|
* host doesn't support the extensions.
|
||||||
|
*
|
||||||
|
* @relates clap_plugin_proxy
|
||||||
|
*/
|
||||||
|
struct ClapHostExtensions {
|
||||||
|
/**
|
||||||
|
* Query all of the host's extensions. This can only be done after the
|
||||||
|
* call to init.
|
||||||
|
*/
|
||||||
|
ClapHostExtensions(const clap_host& host) noexcept;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The default constructor that assumes the host doesn't support any
|
||||||
|
* extensions. We may only query the extensions after the plugin has called
|
||||||
|
* `clap_plugin::init()`.
|
||||||
|
*/
|
||||||
|
ClapHostExtensions() noexcept;
|
||||||
|
|
||||||
|
const clap_host_audio_ports_t* audio_ports = nullptr;
|
||||||
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A proxy for a `clap_plugin`.
|
* A proxy for a `clap_plugin`.
|
||||||
*/
|
*/
|
||||||
@@ -131,10 +154,16 @@ class clap_plugin_proxy {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* The `clap_host_t*` passed when creating the instance. Any callbacks made
|
* The `clap_host_t*` passed when creating the instance. Any callbacks made
|
||||||
* by the proxied plugin instance must go through ere.
|
* by the proxied plugin instance must go through here.
|
||||||
*/
|
*/
|
||||||
const clap_host_t* host_;
|
const clap_host_t* host_;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The host's supported extensions. These will be populated in the
|
||||||
|
* `clap_plugin::init()` call.
|
||||||
|
*/
|
||||||
|
ClapHostExtensions extensions_;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
ClapPluginBridge& bridge_;
|
ClapPluginBridge& bridge_;
|
||||||
size_t instance_id_;
|
size_t instance_id_;
|
||||||
|
|||||||
@@ -26,16 +26,20 @@
|
|||||||
|
|
||||||
namespace fs = ghc::filesystem;
|
namespace fs = ghc::filesystem;
|
||||||
|
|
||||||
// TODO: Query extensions in the initializer list
|
ClapPluginExtensions::ClapPluginExtensions(const clap_plugin& plugin) noexcept
|
||||||
ClapPluginExtensions::ClapPluginExtensions(const clap_plugin& plugin) noexcept {
|
: audio_ports(static_cast<const clap_plugin_audio_ports_t*>(
|
||||||
}
|
plugin.get_extension(&plugin, CLAP_EXT_AUDIO_PORTS))) {}
|
||||||
|
|
||||||
|
ClapPluginExtensions::ClapPluginExtensions() noexcept {}
|
||||||
|
|
||||||
ClapPluginInstance::ClapPluginInstance(
|
ClapPluginInstance::ClapPluginInstance(
|
||||||
const clap_plugin* plugin,
|
const clap_plugin* plugin,
|
||||||
std::unique_ptr<clap_host_proxy> host_proxy) noexcept
|
std::unique_ptr<clap_host_proxy> host_proxy) noexcept
|
||||||
: host_proxy(std::move(host_proxy)),
|
: host_proxy(std::move(host_proxy)),
|
||||||
plugin((assert(plugin), plugin), plugin->destroy),
|
plugin((assert(plugin), plugin), plugin->destroy),
|
||||||
extensions(*plugin) {}
|
// We may only query the supported extensions after initializing the
|
||||||
|
// plugin
|
||||||
|
extensions() {}
|
||||||
|
|
||||||
ClapBridge::ClapBridge(MainContext& main_context,
|
ClapBridge::ClapBridge(MainContext& main_context,
|
||||||
// NOLINTNEXTLINE(bugprone-easily-swappable-parameters)
|
// NOLINTNEXTLINE(bugprone-easily-swappable-parameters)
|
||||||
@@ -223,6 +227,15 @@ void ClapBridge::run() {
|
|||||||
const bool result =
|
const bool result =
|
||||||
instance.plugin->init(instance.plugin.get());
|
instance.plugin->init(instance.plugin.get());
|
||||||
if (result) {
|
if (result) {
|
||||||
|
// At this point we should also get the extension
|
||||||
|
// pointers for the plugin's supported extensions.
|
||||||
|
// In addition we'll send whether or not the plugin
|
||||||
|
// supports these extensions as booleans to the
|
||||||
|
// native plugin side so we can expose these same
|
||||||
|
// extensions to the host.
|
||||||
|
instance.extensions =
|
||||||
|
ClapPluginExtensions(*instance.plugin);
|
||||||
|
|
||||||
// This mimics the same behavior we had to implement
|
// This mimics the same behavior we had to implement
|
||||||
// for VST2 and VST3. The Win32 message loop is
|
// for VST2 and VST3. The Win32 message loop is
|
||||||
// completely blocked while a plugin instance has
|
// completely blocked while a plugin instance has
|
||||||
|
|||||||
@@ -49,12 +49,18 @@ struct ClapPluginExtensions {
|
|||||||
/**
|
/**
|
||||||
* Query all of the plugin's extensions. This can only be done after the
|
* Query all of the plugin's extensions. This can only be done after the
|
||||||
* call to init.
|
* call to init.
|
||||||
*
|
|
||||||
* TODO: Return the supported extensions along with the init call.
|
|
||||||
*/
|
*/
|
||||||
ClapPluginExtensions(const clap_plugin& plugin) noexcept;
|
ClapPluginExtensions(const clap_plugin& plugin) noexcept;
|
||||||
|
|
||||||
// TODO: Supported extensions
|
/**
|
||||||
|
* The default constructor that assumes the plugin doesn't support any
|
||||||
|
* extensions. We may only query the extensions after the plugin has been
|
||||||
|
* initialized, so this is used when creating the `ClapPluginInstance`
|
||||||
|
* object.
|
||||||
|
*/
|
||||||
|
ClapPluginExtensions() noexcept;
|
||||||
|
|
||||||
|
const clap_plugin_audio_ports_t* audio_ports = nullptr;
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
Reference in New Issue
Block a user