From ffbed4ae17aacccef6f0c78021fe67d78ad0c22a Mon Sep 17 00:00:00 2001 From: Robbert van der Helm Date: Wed, 24 Aug 2022 17:19:53 +0200 Subject: [PATCH] Fix bridge function names in CLAP chainloader --- src/chainloader/clap-chainloader.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/chainloader/clap-chainloader.cpp b/src/chainloader/clap-chainloader.cpp index bcb7cee3..11c62d7a 100644 --- a/src/chainloader/clap-chainloader.cpp +++ b/src/chainloader/clap-chainloader.cpp @@ -46,8 +46,8 @@ namespace fs = ghc::filesystem; // `clap_entry.init` gets called using ClapPluginBridge = void; -ClapPluginBridge* (*yabridge_bridge_init)(const char* plugin_path) = nullptr; -void (*yabridge_bridge_free)(ClapPluginBridge* instance) = nullptr; +ClapPluginBridge* (*yabridge_module_init)(const char* plugin_path) = nullptr; +void (*yabridge_module_free)(ClapPluginBridge* instance) = nullptr; const void* (*yabridge_module_get_factory)(ClapPluginBridge* instance, 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 * `clap_entry.init` first gets called. */ -std::unique_ptr bridge( +std::unique_ptr bridge( nullptr, nullptr); /** @@ -99,8 +99,8 @@ bool initialize_library() { } \ } while (false) - LOAD_FUNCTION(yabridge_bridge_init); - LOAD_FUNCTION(yabridge_bridge_free); + LOAD_FUNCTION(yabridge_module_init); + LOAD_FUNCTION(yabridge_module_free); LOAD_FUNCTION(yabridge_module_get_factory); #undef LOAD_FUNCTION @@ -124,8 +124,8 @@ bool clap_entry_init(const char* /*plugin_path*/) { // plugin formats. const fs::path this_plugin_path = get_this_file_location(); bridge = - decltype(bridge)(yabridge_bridge_init(this_plugin_path.c_str()), - yabridge_bridge_free); + decltype(bridge)(yabridge_module_init(this_plugin_path.c_str()), + yabridge_module_free); if (!bridge) { return false; }