diff --git a/source/plugin/Makefile b/source/plugin/Makefile index 5dce1f3ea..f9151eb22 100644 --- a/source/plugin/Makefile +++ b/source/plugin/Makefile @@ -103,7 +103,7 @@ endif ifeq ($(HAVE_JUCE),true) LIBS += ../modules/juce_audio_basics.a -# LIBS += ../modules/juce_audio_devices.a +LIBS += ../modules/juce_audio_processors.a LIBS += ../modules/juce_core.a LIBS += ../modules/juce_data_structures.a LIBS += ../modules/juce_events.a diff --git a/source/plugin/carla-native-base.cpp b/source/plugin/carla-native-base.cpp index 63ce1c6be..61750b6f2 100644 --- a/source/plugin/carla-native-base.cpp +++ b/source/plugin/carla-native-base.cpp @@ -27,26 +27,6 @@ # include "lv2/lv2.h" #endif -// ----------------------------------------------------------------------- - -ulong carla_standalone_get_transient_win_id() -{ - return 0; -} - -const char* carla_standalone_file_callback(FileCallbackOpcode action, bool isDir, const char* title, const char* filter) -{ - CARLA_SAFE_ASSERT_RETURN(title != nullptr && title[0] != '\0', nullptr); - CARLA_SAFE_ASSERT_RETURN(filter != nullptr && filter[0] != '\0', nullptr); - carla_debug("carla_file_callback(%i:%s, %s, \"%s\", \"%s\")", action, CarlaBackend::FileCallbackOpcode2Str(action), bool2str(isDir), title, filter); - - return nullptr; - - // unused - (void)action; - (void)isDir; -} - // ----------------------------------------------------------------------- // Plugin List diff --git a/source/plugin/carla-native-lv2-export.cpp b/source/plugin/carla-native-lv2-export.cpp index abcdc74d5..a96e9e9ef 100644 --- a/source/plugin/carla-native-lv2-export.cpp +++ b/source/plugin/carla-native-lv2-export.cpp @@ -36,9 +36,9 @@ #include -#if JUCE_WINDOWS +#if defined(CARLA_OS_WIN) # define PLUGIN_EXT ".dll" -#elif JUCE_MAC +#elif defined(JUCE_MAC) # define PLUGIN_EXT ".dylib" #else # define PLUGIN_EXT ".so" @@ -53,7 +53,7 @@ using juce::juce_wchar; static StringArray gUsedSymbols; -const String nameToSymbol(const String& name, const uint32_t portIndex) +static const String nameToSymbol(const String& name, const uint32_t portIndex) { String symbol, trimmedName = name.trim().toLowerCase(); @@ -99,7 +99,7 @@ const String nameToSymbol(const String& name, const uint32_t portIndex) // ----------------------------------------------------------------------- -void writeManifestFile(PluginListManager& plm) +static void writeManifestFile(PluginListManager& plm) { String text; @@ -154,7 +154,7 @@ static double host_getSampleRate(NativeHostHandle) { return 44100.0; } static bool host_isOffline(NativeHostHandle) { return true; } static intptr_t host_dispatcher(NativeHostHandle, NativeHostDispatcherOpcode, int32_t, intptr_t, void*, float) { return 0; } -void writePluginFile(const NativePluginDescriptor* const pluginDesc) +static void writePluginFile(const NativePluginDescriptor* const pluginDesc) { const String pluginLabel(pluginDesc->label); const String pluginFile("carla-native.lv2/" + pluginLabel + ".ttl");