Signed-off-by: falkTX <falktx@falktx.com>tags/v2.2.0-RC1
@@ -918,7 +918,7 @@ bool carla_load_file(CarlaHostHandle handle, const char* filename) | |||||
CARLA_SAFE_ASSERT_RETURN(filename != nullptr && filename[0] != '\0', false); | CARLA_SAFE_ASSERT_RETURN(filename != nullptr && filename[0] != '\0', false); | ||||
CARLA_SAFE_ASSERT_WITH_LAST_ERROR_RETURN(handle->engine != nullptr, "Engine is not initialized", false); | CARLA_SAFE_ASSERT_WITH_LAST_ERROR_RETURN(handle->engine != nullptr, "Engine is not initialized", false); | ||||
carla_debug("carla_load_file(%p, \"%s\")", filename); | |||||
carla_debug("carla_load_file(%p, \"%s\")", handle, filename); | |||||
return handle->engine->loadFile(filename); | return handle->engine->loadFile(filename); | ||||
} | } | ||||
@@ -928,7 +928,7 @@ bool carla_load_project(CarlaHostHandle handle, const char* filename) | |||||
CARLA_SAFE_ASSERT_RETURN(filename != nullptr && filename[0] != '\0', false); | CARLA_SAFE_ASSERT_RETURN(filename != nullptr && filename[0] != '\0', false); | ||||
CARLA_SAFE_ASSERT_WITH_LAST_ERROR_RETURN(handle->engine != nullptr, "Engine is not initialized", false); | CARLA_SAFE_ASSERT_WITH_LAST_ERROR_RETURN(handle->engine != nullptr, "Engine is not initialized", false); | ||||
carla_debug("carla_load_project(%p, \"%s\")", filename); | |||||
carla_debug("carla_load_project(%p, \"%s\")", handle, filename); | |||||
return handle->engine->loadProject(filename, true); | return handle->engine->loadProject(filename, true); | ||||
} | } | ||||
@@ -938,7 +938,7 @@ bool carla_save_project(CarlaHostHandle handle, const char* filename) | |||||
CARLA_SAFE_ASSERT_RETURN(filename != nullptr && filename[0] != '\0', false); | CARLA_SAFE_ASSERT_RETURN(filename != nullptr && filename[0] != '\0', false); | ||||
CARLA_SAFE_ASSERT_WITH_LAST_ERROR_RETURN(handle->engine != nullptr, "Engine is not initialized", false); | CARLA_SAFE_ASSERT_WITH_LAST_ERROR_RETURN(handle->engine != nullptr, "Engine is not initialized", false); | ||||
carla_debug("carla_save_project(%p, \"%s\")", filename); | |||||
carla_debug("carla_save_project(%p, \"%s\")", handle, filename); | |||||
return handle->engine->saveProject(filename, true); | return handle->engine->saveProject(filename, true); | ||||
} | } | ||||
@@ -1393,11 +1393,13 @@ void CarlaEngine::callback(const bool sendHost, const bool sendOSC, | |||||
{ | { | ||||
#ifdef DEBUG | #ifdef DEBUG | ||||
if (pData->isIdling) | if (pData->isIdling) | ||||
carla_stdout("CarlaEngine::callback [while idling] (%i:%s, %i, %i, %i, %i, %f, \"%s\")", | |||||
carla_stdout("CarlaEngine::callback [while idling] (%s, %s, %i:%s, %i, %i, %i, %i, %f, \"%s\")", | |||||
bool2str(sendHost), bool2str(sendOSC), | |||||
action, EngineCallbackOpcode2Str(action), pluginId, value1, value2, value3, | action, EngineCallbackOpcode2Str(action), pluginId, value1, value2, value3, | ||||
static_cast<double>(valuef), valueStr); | static_cast<double>(valuef), valueStr); | ||||
else if (action != ENGINE_CALLBACK_IDLE && action != ENGINE_CALLBACK_NOTE_ON && action != ENGINE_CALLBACK_NOTE_OFF) | else if (action != ENGINE_CALLBACK_IDLE && action != ENGINE_CALLBACK_NOTE_ON && action != ENGINE_CALLBACK_NOTE_OFF) | ||||
carla_debug("CarlaEngine::callback(%i:%s, %i, %i, %i, %i, %f, \"%s\")", | |||||
carla_debug("CarlaEngine::callback(%s, %s, %i:%s, %i, %i, %i, %i, %f, \"%s\")", | |||||
bool2str(sendHost), bool2str(sendOSC), | |||||
action, EngineCallbackOpcode2Str(action), pluginId, value1, value2, value3, | action, EngineCallbackOpcode2Str(action), pluginId, value1, value2, value3, | ||||
static_cast<double>(valuef), valueStr); | static_cast<double>(valuef), valueStr); | ||||
#endif | #endif | ||||
@@ -46,8 +46,6 @@ int jack_set_buffer_size(jack_client_t* client, jack_nframes_t nframes) | |||||
CARLA_EXPORT | CARLA_EXPORT | ||||
jack_nframes_t jack_get_sample_rate(jack_client_t* client) | jack_nframes_t jack_get_sample_rate(jack_client_t* client) | ||||
{ | { | ||||
carla_debug("%s(%p)", __FUNCTION__, client); | |||||
JackClientState* const jclient = (JackClientState*)client; | JackClientState* const jclient = (JackClientState*)client; | ||||
CARLA_SAFE_ASSERT_RETURN(jclient != nullptr, 0); | CARLA_SAFE_ASSERT_RETURN(jclient != nullptr, 0); | ||||
@@ -262,7 +262,7 @@ public: | |||||
// NOTE: do not use this function unless strictly needed. it can be very expensive if the list is big | // NOTE: do not use this function unless strictly needed. it can be very expensive if the list is big | ||||
const T& getAt(const std::size_t index, const T& fallback) const noexcept | const T& getAt(const std::size_t index, const T& fallback) const noexcept | ||||
{ | { | ||||
CARLA_SAFE_ASSERT_RETURN(fCount > 0 && index < fCount, fallback); | |||||
CARLA_SAFE_ASSERT_UINT2_RETURN(fCount > 0 && index < fCount, index, fCount, fallback); | |||||
std::size_t i = 0; | std::size_t i = 0; | ||||
ListHead* entry = fQueue.next; | ListHead* entry = fQueue.next; | ||||