@@ -62,7 +62,7 @@ LINK_OPTS = | |||||
else | else | ||||
BASE_FLAGS += -DNDEBUG $(BASE_OPTS) -fvisibility=hidden | BASE_FLAGS += -DNDEBUG $(BASE_OPTS) -fvisibility=hidden | ||||
CXXFLAGS += -fvisibility-inlines-hidden | CXXFLAGS += -fvisibility-inlines-hidden | ||||
LINK_OPTS += -Wl,--strip-all | |||||
# LINK_OPTS += -Wl,--strip-all | |||||
endif | endif | ||||
32BIT_FLAGS = -m32 | 32BIT_FLAGS = -m32 | ||||
@@ -943,6 +943,7 @@ public: | |||||
*/ | */ | ||||
void setCallback(const EngineCallbackFunc func, void* const ptr); | void setCallback(const EngineCallbackFunc func, void* const ptr); | ||||
#ifndef BUILD_BRIDGE | |||||
// ------------------------------------------------------------------- | // ------------------------------------------------------------------- | ||||
// Patchbay | // Patchbay | ||||
@@ -960,6 +961,7 @@ public: | |||||
* Force the engine to resend all patchbay clients, ports and connections again. | * Force the engine to resend all patchbay clients, ports and connections again. | ||||
*/ | */ | ||||
virtual bool patchbayRefresh(); | virtual bool patchbayRefresh(); | ||||
#endif | |||||
// ------------------------------------------------------------------- | // ------------------------------------------------------------------- | ||||
// Transport | // Transport | ||||
@@ -610,6 +610,7 @@ CARLA_EXPORT bool carla_load_project(const char* filename); | |||||
*/ | */ | ||||
CARLA_EXPORT bool carla_save_project(const char* filename); | CARLA_EXPORT bool carla_save_project(const char* filename); | ||||
#ifndef BUILD_BRIDGE | |||||
/*! | /*! | ||||
* Connect two patchbay ports. | * Connect two patchbay ports. | ||||
* @param portIdA Output port | * @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. | * Force the engine to resend all patchbay clients, ports and connections again. | ||||
*/ | */ | ||||
CARLA_EXPORT bool carla_patchbay_refresh(); | CARLA_EXPORT bool carla_patchbay_refresh(); | ||||
#endif | |||||
/*! | /*! | ||||
* Start playback of the engine transport. | * Start playback of the engine transport. | ||||
@@ -1875,6 +1875,7 @@ void CarlaEngine::setCallback(const EngineCallbackFunc func, void* const ptr) | |||||
pData->callbackPtr = ptr; | pData->callbackPtr = ptr; | ||||
} | } | ||||
#ifndef BUILD_BRIDGE | |||||
// ----------------------------------------------------------------------- | // ----------------------------------------------------------------------- | ||||
// Patchbay | // Patchbay | ||||
@@ -2066,6 +2067,7 @@ bool CarlaEngine::patchbayRefresh() | |||||
setLastError("Unsupported operation"); | setLastError("Unsupported operation"); | ||||
return false; | return false; | ||||
} | } | ||||
#endif | |||||
// ----------------------------------------------------------------------- | // ----------------------------------------------------------------------- | ||||
// Transport | // Transport | ||||
@@ -281,7 +281,9 @@ public: | |||||
const PluginBridgeOpcode opcode(fShmControl.readOpcode()); | const PluginBridgeOpcode opcode(fShmControl.readOpcode()); | ||||
if (opcode != kPluginBridgeOpcodeProcess) | if (opcode != kPluginBridgeOpcodeProcess) | ||||
{ | |||||
carla_debug("CarlaEngineBridge::run() - got opcode: %s", PluginBridgeOpcode2str(opcode)); | carla_debug("CarlaEngineBridge::run() - got opcode: %s", PluginBridgeOpcode2str(opcode)); | ||||
} | |||||
switch (opcode) | switch (opcode) | ||||
{ | { | ||||
@@ -431,3 +433,26 @@ CarlaEngine* CarlaEngine::newBridge(const char* const audioBaseName, const char* | |||||
} | } | ||||
CARLA_BACKEND_END_NAMESPACE | 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 | |||||
// ----------------------------------------------------------------------- |
@@ -1268,7 +1268,7 @@ public: | |||||
void sampleRateChanged(const double newSampleRate) override | 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); | carla_debug("LadspaPlugin::sampleRateChanged(%g) - start", newSampleRate); | ||||
// TODO | // TODO | ||||
@@ -1175,6 +1175,9 @@ CarlaPlugin* CarlaPlugin::newGIG(const Initializer& init, const bool use16Outs) | |||||
#else | #else | ||||
init.engine->setLastError("linuxsampler support not available"); | init.engine->setLastError("linuxsampler support not available"); | ||||
return nullptr; | return nullptr; | ||||
// unused | |||||
(void)use16Outs; | |||||
#endif | #endif | ||||
} | } | ||||
@@ -1186,6 +1189,9 @@ CarlaPlugin* CarlaPlugin::newSFZ(const Initializer& init, const bool use16Outs) | |||||
#else | #else | ||||
init.engine->setLastError("linuxsampler support not available"); | init.engine->setLastError("linuxsampler support not available"); | ||||
return nullptr; | return nullptr; | ||||
// unused | |||||
(void)use16Outs; | |||||
#endif | #endif | ||||
} | } | ||||
@@ -771,6 +771,7 @@ bool carla_save_project(const char* filename) | |||||
return false; | return false; | ||||
} | } | ||||
#ifndef BUILD_BRIDGE | |||||
// ------------------------------------------------------------------------------------------------------------------- | // ------------------------------------------------------------------------------------------------------------------- | ||||
bool carla_patchbay_connect(int portIdA, int portIdB) | bool carla_patchbay_connect(int portIdA, int portIdB) | ||||
@@ -809,6 +810,7 @@ bool carla_patchbay_refresh() | |||||
gStandalone.lastError = "Engine is not running"; | gStandalone.lastError = "Engine is not running"; | ||||
return false; | return false; | ||||
} | } | ||||
#endif | |||||
// ------------------------------------------------------------------------------------------------------------------- | // ------------------------------------------------------------------------------------------------------------------- | ||||
@@ -36,9 +36,7 @@ CarlaBridgeClient::CarlaBridgeClient(const char* const uiTitle) | |||||
, fUI(CarlaBridgeToolkit::createNew(this, uiTitle)) | , fUI(CarlaBridgeToolkit::createNew(this, uiTitle)) | ||||
#endif | #endif | ||||
{ | { | ||||
#ifdef BUILD_BRIDGE_UI | |||||
CARLA_ASSERT(uiTitle != nullptr); | |||||
#endif | |||||
CARLA_ASSERT(uiTitle != nullptr && uiTitle[0] != '\0'); | |||||
carla_debug("CarlaBridgeClient::CarlaBridgeClient(\"%s\")", uiTitle); | carla_debug("CarlaBridgeClient::CarlaBridgeClient(\"%s\")", uiTitle); | ||||
} | } | ||||
@@ -277,6 +277,7 @@ public: | |||||
void setChunkData(const char* const filePath) | void setChunkData(const char* const filePath) | ||||
{ | { | ||||
CARLA_SAFE_ASSERT_RETURN(filePath != nullptr && filePath[0] != '\0',); | |||||
CARLA_SAFE_ASSERT_RETURN(fPlugin != nullptr,); | CARLA_SAFE_ASSERT_RETURN(fPlugin != nullptr,); | ||||
carla_debug("CarlaPluginClient::setChunkData(\"%s\")", filePath); | carla_debug("CarlaPluginClient::setChunkData(\"%s\")", filePath); | ||||