diff --git a/source/Makefile.mk b/source/Makefile.mk index d7f89d268..180689a31 100644 --- a/source/Makefile.mk +++ b/source/Makefile.mk @@ -62,7 +62,7 @@ LINK_OPTS = else BASE_FLAGS += -DNDEBUG $(BASE_OPTS) -fvisibility=hidden CXXFLAGS += -fvisibility-inlines-hidden -LINK_OPTS += -Wl,--strip-all +# LINK_OPTS += -Wl,--strip-all endif 32BIT_FLAGS = -m32 diff --git a/source/backend/CarlaEngine.hpp b/source/backend/CarlaEngine.hpp index c0af769f7..437e3d914 100644 --- a/source/backend/CarlaEngine.hpp +++ b/source/backend/CarlaEngine.hpp @@ -943,6 +943,7 @@ public: */ void setCallback(const EngineCallbackFunc func, void* const ptr); +#ifndef BUILD_BRIDGE // ------------------------------------------------------------------- // Patchbay @@ -960,6 +961,7 @@ public: * Force the engine to resend all patchbay clients, ports and connections again. */ virtual bool patchbayRefresh(); +#endif // ------------------------------------------------------------------- // Transport diff --git a/source/backend/CarlaHost.h b/source/backend/CarlaHost.h index 9f34e09d5..2f184e37a 100644 --- a/source/backend/CarlaHost.h +++ b/source/backend/CarlaHost.h @@ -610,6 +610,7 @@ CARLA_EXPORT bool carla_load_project(const char* filename); */ CARLA_EXPORT bool carla_save_project(const char* filename); +#ifndef BUILD_BRIDGE /*! * Connect two patchbay ports. * @param portIdA Output port @@ -629,6 +630,7 @@ CARLA_EXPORT bool carla_patchbay_disconnect(int connectionId); * Force the engine to resend all patchbay clients, ports and connections again. */ CARLA_EXPORT bool carla_patchbay_refresh(); +#endif /*! * Start playback of the engine transport. diff --git a/source/backend/engine/CarlaEngine.cpp b/source/backend/engine/CarlaEngine.cpp index c469cefee..554f09f7e 100644 --- a/source/backend/engine/CarlaEngine.cpp +++ b/source/backend/engine/CarlaEngine.cpp @@ -1875,6 +1875,7 @@ void CarlaEngine::setCallback(const EngineCallbackFunc func, void* const ptr) pData->callbackPtr = ptr; } +#ifndef BUILD_BRIDGE // ----------------------------------------------------------------------- // Patchbay @@ -2066,6 +2067,7 @@ bool CarlaEngine::patchbayRefresh() setLastError("Unsupported operation"); return false; } +#endif // ----------------------------------------------------------------------- // Transport diff --git a/source/backend/engine/CarlaEngineBridge.cpp b/source/backend/engine/CarlaEngineBridge.cpp index e769eebe0..9bcfefa06 100644 --- a/source/backend/engine/CarlaEngineBridge.cpp +++ b/source/backend/engine/CarlaEngineBridge.cpp @@ -281,7 +281,9 @@ public: const PluginBridgeOpcode opcode(fShmControl.readOpcode()); if (opcode != kPluginBridgeOpcodeProcess) + { carla_debug("CarlaEngineBridge::run() - got opcode: %s", PluginBridgeOpcode2str(opcode)); + } switch (opcode) { @@ -431,3 +433,26 @@ CarlaEngine* CarlaEngine::newBridge(const char* const audioBaseName, const char* } CARLA_BACKEND_END_NAMESPACE + +// ----------------------------------------------------------------------- +// Extra stuff for linking purposes + +CARLA_BACKEND_START_NAMESPACE + +CarlaEngine* CarlaEngine::newRtAudio(const AudioApi) { return nullptr; } +unsigned int CarlaEngine::getRtAudioApiCount() { return 0; } +const char* CarlaEngine::getRtAudioApiName(const unsigned int) { return nullptr; } +const char* const* CarlaEngine::getRtAudioApiDeviceNames(const unsigned int) { return nullptr; } +const EngineDriverDeviceInfo* CarlaEngine::getRtAudioDeviceInfo(const unsigned int, const char* const) { return nullptr; } + +#ifdef HAVE_JUCE +CarlaEngine* CarlaEngine::newJuce(const AudioApi) { return nullptr; } +unsigned int CarlaEngine::getJuceApiCount() { return 0; } +const char* CarlaEngine::getJuceApiName(const unsigned int) { return nullptr; } +const char* const* CarlaEngine::getJuceApiDeviceNames(const unsigned int) { return nullptr; } +const EngineDriverDeviceInfo* CarlaEngine::getJuceDeviceInfo(const unsigned int, const char* const) { return nullptr; } +#endif + +CARLA_BACKEND_END_NAMESPACE + +// ----------------------------------------------------------------------- diff --git a/source/backend/plugin/LadspaPlugin.cpp b/source/backend/plugin/LadspaPlugin.cpp index 1bd7d7767..96d3fd78a 100644 --- a/source/backend/plugin/LadspaPlugin.cpp +++ b/source/backend/plugin/LadspaPlugin.cpp @@ -1268,7 +1268,7 @@ public: void sampleRateChanged(const double newSampleRate) override { - CARLA_ASSERT_INT(newSampleRate > 0.0, newSampleRate); + CARLA_ASSERT_INT(newSampleRate > 0.0, (int)newSampleRate); carla_debug("LadspaPlugin::sampleRateChanged(%g) - start", newSampleRate); // TODO diff --git a/source/backend/plugin/LinuxSamplerPlugin.cpp b/source/backend/plugin/LinuxSamplerPlugin.cpp index a33b3d241..28edfb3cd 100644 --- a/source/backend/plugin/LinuxSamplerPlugin.cpp +++ b/source/backend/plugin/LinuxSamplerPlugin.cpp @@ -1175,6 +1175,9 @@ CarlaPlugin* CarlaPlugin::newGIG(const Initializer& init, const bool use16Outs) #else init.engine->setLastError("linuxsampler support not available"); return nullptr; + + // unused + (void)use16Outs; #endif } @@ -1186,6 +1189,9 @@ CarlaPlugin* CarlaPlugin::newSFZ(const Initializer& init, const bool use16Outs) #else init.engine->setLastError("linuxsampler support not available"); return nullptr; + + // unused + (void)use16Outs; #endif } diff --git a/source/backend/standalone/CarlaStandalone.cpp b/source/backend/standalone/CarlaStandalone.cpp index 1443db3f5..ec569e7d6 100644 --- a/source/backend/standalone/CarlaStandalone.cpp +++ b/source/backend/standalone/CarlaStandalone.cpp @@ -771,6 +771,7 @@ bool carla_save_project(const char* filename) return false; } +#ifndef BUILD_BRIDGE // ------------------------------------------------------------------------------------------------------------------- bool carla_patchbay_connect(int portIdA, int portIdB) @@ -809,6 +810,7 @@ bool carla_patchbay_refresh() gStandalone.lastError = "Engine is not running"; return false; } +#endif // ------------------------------------------------------------------------------------------------------------------- diff --git a/source/bridges/CarlaBridgeClient.cpp b/source/bridges/CarlaBridgeClient.cpp index ab697d65b..29a9d3f33 100644 --- a/source/bridges/CarlaBridgeClient.cpp +++ b/source/bridges/CarlaBridgeClient.cpp @@ -36,9 +36,7 @@ CarlaBridgeClient::CarlaBridgeClient(const char* const uiTitle) , fUI(CarlaBridgeToolkit::createNew(this, uiTitle)) #endif { -#ifdef BUILD_BRIDGE_UI - CARLA_ASSERT(uiTitle != nullptr); -#endif + CARLA_ASSERT(uiTitle != nullptr && uiTitle[0] != '\0'); carla_debug("CarlaBridgeClient::CarlaBridgeClient(\"%s\")", uiTitle); } diff --git a/source/bridges/CarlaBridgePlugin.cpp b/source/bridges/CarlaBridgePlugin.cpp index 6bb81a5f4..0cfe0000a 100644 --- a/source/bridges/CarlaBridgePlugin.cpp +++ b/source/bridges/CarlaBridgePlugin.cpp @@ -277,6 +277,7 @@ public: void setChunkData(const char* const filePath) { + CARLA_SAFE_ASSERT_RETURN(filePath != nullptr && filePath[0] != '\0',); CARLA_SAFE_ASSERT_RETURN(fPlugin != nullptr,); carla_debug("CarlaPluginClient::setChunkData(\"%s\")", filePath);