From 62da1783915c2dd7bbd03533271ebea1fec498d7 Mon Sep 17 00:00:00 2001 From: falkTX Date: Wed, 12 Sep 2018 11:25:50 +0200 Subject: [PATCH] Cleanup CarlaNativePlugin header --- source/includes/CarlaNativePlugin.h | 13 +------------ source/plugin/carla-native-plugin.cpp | 19 +++++++++++++++++-- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/source/includes/CarlaNativePlugin.h b/source/includes/CarlaNativePlugin.h index 088aa5637..841ef16a8 100644 --- a/source/includes/CarlaNativePlugin.h +++ b/source/includes/CarlaNativePlugin.h @@ -20,7 +20,6 @@ #include "CarlaBackend.h" #include "CarlaNative.h" -#include "CarlaEngine.hpp" /*! * Get the absolute filename of this carla library. @@ -46,17 +45,7 @@ CARLA_EXPORT const NativePluginDescriptor* carla_get_native_patchbay_plugin(); /*! * Get the internal CarlaEngine instance. */ -static inline -CarlaBackend::CarlaEngine* carla_plugin_get_engine(const NativePluginDescriptor* desc, NativePluginHandle handle) -{ - CARLA_SAFE_ASSERT_RETURN(desc != nullptr, nullptr); - CARLA_SAFE_ASSERT_RETURN(handle != nullptr, nullptr); - - using CarlaBackend::CarlaEngine; - return (CarlaEngine*)static_cast(desc->dispatcher(handle, - NATIVE_PLUGIN_OPCODE_GET_INTERNAL_HANDLE, - 0, 0, nullptr, 0.0f)); -} +CARLA_EXPORT CarlaBackend::CarlaEngine* carla_get_native_plugin_engine(const NativePluginDescriptor* desc, NativePluginHandle handle); #endif #endif /* CARLA_NATIVE_PLUGIN_H_INCLUDED */ diff --git a/source/plugin/carla-native-plugin.cpp b/source/plugin/carla-native-plugin.cpp index 992f12bbb..8f5077a6b 100644 --- a/source/plugin/carla-native-plugin.cpp +++ b/source/plugin/carla-native-plugin.cpp @@ -15,12 +15,27 @@ * For a full copy of the GNU General Public License see the doc/GPL.txt file. */ -#include "CarlaUtils.hpp" #include "CarlaNativePlugin.h" +#include "CarlaEngine.hpp" #include "CarlaString.hpp" + #include "water/files/File.h" +CARLA_BACKEND_USE_NAMESPACE + +// -------------------------------------------------------------------------------------------------------------------- + +CarlaEngine* carla_get_native_plugin_engine(const NativePluginDescriptor* desc, NativePluginHandle handle) +{ + CARLA_SAFE_ASSERT_RETURN(desc != nullptr, nullptr); + CARLA_SAFE_ASSERT_RETURN(handle != nullptr, nullptr); + + return (CarlaEngine*)static_cast(desc->dispatcher(handle, + NATIVE_PLUGIN_OPCODE_GET_INTERNAL_HANDLE, + 0, 0, nullptr, 0.0f)); +} + // -------------------------------------------------------------------------------------------------------------------- static uint32_t get_buffer_size(NativeHostHandle) @@ -79,7 +94,7 @@ int main() const NativePluginHandle handle = rack->instantiate(&host); CARLA_SAFE_ASSERT_RETURN(handle != nullptr, 1); - CarlaBackend::CarlaEngine* const engine = carla_plugin_get_engine(rack, handle); + CarlaEngine* const engine = carla_get_native_plugin_engine(rack, handle); CARLA_SAFE_ASSERT_RETURN(engine != nullptr, 1); carla_stdout("Got Engine %p, %s, %i, %f",