@@ -31,6 +31,17 @@ | |||||
#include <cerrno> | #include <cerrno> | ||||
#include <ctime> | #include <ctime> | ||||
#ifdef JACKBRIDGE_EXPORT | |||||
// ------------------------------------------------------------------- | |||||
bool jackbridge_is_ok() noexcept | |||||
{ | |||||
return true; | |||||
} | |||||
#endif | |||||
// ------------------------------------------------------------------- | |||||
CARLA_BACKEND_START_NAMESPACE | CARLA_BACKEND_START_NAMESPACE | ||||
#if 0 | #if 0 | ||||
@@ -215,7 +226,7 @@ public: | |||||
fShmTime.filename += timeBaseName; | fShmTime.filename += timeBaseName; | ||||
} | } | ||||
~CarlaEngineBridge() override | |||||
~CarlaEngineBridge() noexcept override | |||||
{ | { | ||||
carla_debug("CarlaEngineBridge::~CarlaEngineBridge()"); | carla_debug("CarlaEngineBridge::~CarlaEngineBridge()"); | ||||
} | } | ||||
@@ -658,7 +658,7 @@ public: | |||||
carla_zeroStruct<jack_position_t>(fTransportPos); | carla_zeroStruct<jack_position_t>(fTransportPos); | ||||
} | } | ||||
~CarlaEngineJack() override | |||||
~CarlaEngineJack() noexcept override | |||||
{ | { | ||||
carla_debug("CarlaEngineJack::~CarlaEngineJack()"); | carla_debug("CarlaEngineJack::~CarlaEngineJack()"); | ||||
CARLA_SAFE_ASSERT(fClient == nullptr); | CARLA_SAFE_ASSERT(fClient == nullptr); | ||||
@@ -1032,7 +1032,7 @@ const CarlaTransportInfo* carla_get_transport_info() | |||||
bool carla_add_plugin(BinaryType btype, PluginType ptype, const char* filename, const char* name, const char* label, int64_t uniqueId, const void* extraPtr) | bool carla_add_plugin(BinaryType btype, PluginType ptype, const char* filename, const char* name, const char* label, int64_t uniqueId, const void* extraPtr) | ||||
{ | { | ||||
CARLA_SAFE_ASSERT_RETURN(label != nullptr && label[0] != '\0', false); | |||||
CARLA_SAFE_ASSERT_RETURN(label != nullptr /*&& label[0] != '\0'*/, false); | |||||
carla_debug("carla_add_plugin(%i:%s, %i:%s, \"%s\", \"%s\", \"%s\", " P_INT64 ", %p)", btype, CB::BinaryType2Str(btype), ptype, CB::PluginType2Str(ptype), filename, name, label, uniqueId, extraPtr); | carla_debug("carla_add_plugin(%i:%s, %i:%s, \"%s\", \"%s\", \"%s\", " P_INT64 ", %p)", btype, CB::BinaryType2Str(btype), ptype, CB::PluginType2Str(ptype), filename, name, label, uniqueId, extraPtr); | ||||
if (gStandalone.engine != nullptr) | if (gStandalone.engine != nullptr) | ||||
@@ -580,8 +580,8 @@ int main(int argc, char* argv[]) | |||||
if (std::strcmp(name, "(none)") == 0) | if (std::strcmp(name, "(none)") == 0) | ||||
name = nullptr; | name = nullptr; | ||||
if (std::strlen(label) == 0) | |||||
label = nullptr; | |||||
//if (std::strlen(label) == 0) | |||||
// label = nullptr; | |||||
char bridgeBaseAudioName[6+1]; | char bridgeBaseAudioName[6+1]; | ||||
char bridgeBaseControlName[6+1]; | char bridgeBaseControlName[6+1]; | ||||
@@ -82,7 +82,7 @@ void* lib_symbol(void* const lib, const char* const symbol) noexcept | |||||
CARLA_SAFE_ASSERT_RETURN(symbol != nullptr && symbol[0] != '\0', nullptr); | CARLA_SAFE_ASSERT_RETURN(symbol != nullptr && symbol[0] != '\0', nullptr); | ||||
#ifdef CARLA_OS_WIN | #ifdef CARLA_OS_WIN | ||||
return (void*)GetProcAddressA((HMODULE)lib, symbol); | |||||
return (void*)GetProcAddress((HMODULE)lib, symbol); | |||||
#else | #else | ||||
return dlsym(lib, symbol); | return dlsym(lib, symbol); | ||||
#endif | #endif | ||||
@@ -231,7 +231,7 @@ void carla_setenv(const char* const key, const char* const value) noexcept | |||||
#ifdef CARLA_OS_WIN | #ifdef CARLA_OS_WIN | ||||
try { | try { | ||||
::SetEnvironmentVariableA(key, value); | ::SetEnvironmentVariableA(key, value); | ||||
} CARLA_SAFE_EXCEPTION("carla_setenv",); | |||||
} CARLA_SAFE_EXCEPTION("carla_setenv"); | |||||
#else | #else | ||||
::setenv(key, value, 1); | ::setenv(key, value, 1); | ||||
#endif | #endif | ||||