vanja/yabridge
1
0
Fork 0
mirror of https://github.com/robbert-vdh/yabridge.git synced 2026-05-09 20:29:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix bridge function names in CLAP chainloader

Browse Source
This commit is contained in:
Robbert van der Helm
2022-08-24 17:19:53 +02:00
parent 77e703e9e3
commit ffbed4ae17
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/chainloader/clap-chainloader.cpp
+7 -7
View File
@@ -46,8 +46,8 @@ namespace fs = ghc::filesystem;
// `clap_entry.init` gets called // `clap_entry.init` gets called
using ClapPluginBridge = void; using ClapPluginBridge = void;
ClapPluginBridge* (*yabridge_bridge_init)(const char* plugin_path) = nullptr; ClapPluginBridge* (*yabridge_module_init)(const char* plugin_path) = nullptr;
void (*yabridge_bridge_free)(ClapPluginBridge* instance) = nullptr; void (*yabridge_module_free)(ClapPluginBridge* instance) = nullptr;
const void* (*yabridge_module_get_factory)(ClapPluginBridge* instance, const void* (*yabridge_module_get_factory)(ClapPluginBridge* instance,
const char* factory_id) = nullptr; const char* factory_id) = nullptr;
@@ -55,7 +55,7 @@ const void* (*yabridge_module_get_factory)(ClapPluginBridge* instance,
* The bridge instance for this chainloader. This is initialized when * The bridge instance for this chainloader. This is initialized when
* `clap_entry.init` first gets called. * `clap_entry.init` first gets called.
*/ */
std::unique_ptr<ClapPluginBridge, decltype(yabridge_bridge_free)> bridge( std::unique_ptr<ClapPluginBridge, decltype(yabridge_module_free)> bridge(
nullptr, nullptr,
nullptr); nullptr);
/** /**
@@ -99,8 +99,8 @@ bool initialize_library() {
} \ } \
} while (false) } while (false)
LOAD_FUNCTION(yabridge_bridge_init); LOAD_FUNCTION(yabridge_module_init);
LOAD_FUNCTION(yabridge_bridge_free); LOAD_FUNCTION(yabridge_module_free);
LOAD_FUNCTION(yabridge_module_get_factory); LOAD_FUNCTION(yabridge_module_get_factory);
#undef LOAD_FUNCTION #undef LOAD_FUNCTION
@@ -124,8 +124,8 @@ bool clap_entry_init(const char* /*plugin_path*/) {
// plugin formats. // plugin formats.
const fs::path this_plugin_path = get_this_file_location(); const fs::path this_plugin_path = get_this_file_location();
bridge = bridge =
decltype(bridge)(yabridge_bridge_init(this_plugin_path.c_str()), decltype(bridge)(yabridge_module_init(this_plugin_path.c_str()),
yabridge_bridge_free); yabridge_module_free);
if (!bridge) { if (!bridge) {
return false; return false;
} }