Browse Source

Fix strict debug build

Signed-off-by: falkTX <falktx@falktx.com>
tags/v2.1-rc1
falkTX 5 years ago
parent
commit
63daa721c3
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
9 changed files with 29 additions and 18 deletions
  1. +6
    -6
      source/backend/CarlaStandalone.cpp
  2. +4
    -2
      source/backend/engine/CarlaEngine.cpp
  3. +2
    -1
      source/backend/plugin/CarlaPluginNative.cpp
  4. +8
    -4
      source/backend/plugin/CarlaPluginVST2.cpp
  5. +1
    -1
      source/bridges-plugin/CarlaBridgePlugin.cpp
  6. +3
    -1
      source/native-plugins/audio-base.hpp
  7. +1
    -1
      source/native-plugins/midi-pattern.cpp
  8. +2
    -1
      source/plugin/carla-lv2.cpp
  9. +2
    -1
      source/plugin/carla-vst.cpp

+ 6
- 6
source/backend/CarlaStandalone.cpp View File

@@ -1730,7 +1730,7 @@ void carla_set_drywet(uint pluginId, float value)
CarlaPlugin* const plugin(gStandalone.engine->getPlugin(pluginId));
CARLA_SAFE_ASSERT_RETURN(plugin != nullptr,);

carla_debug("carla_set_drywet(%i, %f)", pluginId, value);
carla_debug("carla_set_drywet(%i, %f)", pluginId, static_cast<double>(value));
return plugin->setDryWet(value, true, false);
}

@@ -1741,7 +1741,7 @@ void carla_set_volume(uint pluginId, float value)
CarlaPlugin* const plugin(gStandalone.engine->getPlugin(pluginId));
CARLA_SAFE_ASSERT_RETURN(plugin != nullptr,);

carla_debug("carla_set_volume(%i, %f)", pluginId, value);
carla_debug("carla_set_volume(%i, %f)", pluginId, static_cast<double>(value));
return plugin->setVolume(value, true, false);
}

@@ -1752,7 +1752,7 @@ void carla_set_balance_left(uint pluginId, float value)
CarlaPlugin* const plugin(gStandalone.engine->getPlugin(pluginId));
CARLA_SAFE_ASSERT_RETURN(plugin != nullptr,);

carla_debug("carla_set_balance_left(%i, %f)", pluginId, value);
carla_debug("carla_set_balance_left(%i, %f)", pluginId, static_cast<double>(value));
return plugin->setBalanceLeft(value, true, false);
}

@@ -1763,7 +1763,7 @@ void carla_set_balance_right(uint pluginId, float value)
CarlaPlugin* const plugin(gStandalone.engine->getPlugin(pluginId));
CARLA_SAFE_ASSERT_RETURN(plugin != nullptr,);

carla_debug("carla_set_balance_right(%i, %f)", pluginId, value);
carla_debug("carla_set_balance_right(%i, %f)", pluginId, static_cast<double>(value));
return plugin->setBalanceRight(value, true, false);
}

@@ -1774,7 +1774,7 @@ void carla_set_panning(uint pluginId, float value)
CarlaPlugin* const plugin(gStandalone.engine->getPlugin(pluginId));
CARLA_SAFE_ASSERT_RETURN(plugin != nullptr,);

carla_debug("carla_set_panning(%i, %f)", pluginId, value);
carla_debug("carla_set_panning(%i, %f)", pluginId, static_cast<double>(value));
return plugin->setPanning(value, true, false);
}

@@ -1811,7 +1811,7 @@ void carla_set_parameter_value(uint pluginId, uint32_t parameterId, float value)
CarlaPlugin* const plugin(gStandalone.engine->getPlugin(pluginId));
CARLA_SAFE_ASSERT_RETURN(plugin != nullptr,);

carla_debug("carla_set_parameter_value(%i, %i, %f)", pluginId, parameterId, value);
carla_debug("carla_set_parameter_value(%i, %i, %f)", pluginId, parameterId, static_cast<double>(value));
CARLA_SAFE_ASSERT_RETURN(parameterId < plugin->getParameterCount(),);

return plugin->setParameterValue(parameterId, value, true, true, false);


+ 4
- 2
source/backend/engine/CarlaEngine.cpp View File

@@ -1312,10 +1312,12 @@ void CarlaEngine::callback(const bool sendHost, const bool sendOsc,
#ifdef DEBUG
if (pData->isIdling)
carla_stdout("CarlaEngine::callback [while idling] (%i:%s, %i, %i, %i, %i, %f, \"%s\")",
action, EngineCallbackOpcode2Str(action), pluginId, value1, value2, value3, valuef, valueStr);
action, EngineCallbackOpcode2Str(action), pluginId, value1, value2, value3,
static_cast<double>(valuef), valueStr);
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\")",
action, EngineCallbackOpcode2Str(action), pluginId, value1, value2, value3, valuef, valueStr);
action, EngineCallbackOpcode2Str(action), pluginId, value1, value2, value3,
static_cast<double>(valuef), valueStr);
#endif

if (sendHost && pData->callback != nullptr)


+ 2
- 1
source/backend/plugin/CarlaPluginNative.cpp View File

@@ -2461,7 +2461,8 @@ protected:

intptr_t handleDispatcher(const NativeHostDispatcherOpcode opcode, const int32_t index, const intptr_t value, void* const ptr, const float opt)
{
carla_debug("CarlaPluginNative::handleDispatcher(%i, %i, " P_INTPTR ", %p, %f)", opcode, index, value, ptr, opt);
carla_debug("CarlaPluginNative::handleDispatcher(%i, %i, " P_INTPTR ", %p, %f)",
opcode, index, value, ptr, static_cast<double>(opt));

intptr_t ret = 0;



+ 8
- 4
source/backend/plugin/CarlaPluginVST2.cpp View File

@@ -1847,7 +1847,8 @@ protected:
CARLA_SAFE_ASSERT_RETURN(fEffect != nullptr, 0);
#ifdef DEBUG
if (opcode != effIdle && opcode != effEditIdle && opcode != effProcessEvents)
carla_debug("CarlaPluginVST2::dispatcher(%02i:%s, %i, " P_INTPTR ", %p, %f)", opcode, vstEffectOpcode2str(opcode), index, value, ptr, opt);
carla_debug("CarlaPluginVST2::dispatcher(%02i:%s, %i, " P_INTPTR ", %p, %f)",
opcode, vstEffectOpcode2str(opcode), index, value, ptr, static_cast<double>(opt));
#endif

try {
@@ -1859,7 +1860,8 @@ protected:
{
#ifdef DEBUG
if (opcode != audioMasterGetTime)
carla_debug("CarlaPluginVST2::handleAudioMasterCallback(%02i:%s, %i, " P_INTPTR ", %p, %f)", opcode, vstMasterOpcode2str(opcode), index, value, ptr, opt);
carla_debug("CarlaPluginVST2::handleAudioMasterCallback(%02i:%s, %i, " P_INTPTR ", %p, %f)",
opcode, vstMasterOpcode2str(opcode), index, value, ptr, static_cast<double>(opt));
#endif

intptr_t ret = 0;
@@ -2229,7 +2231,8 @@ protected:
#endif

default:
carla_debug("CarlaPluginVST2::handleAudioMasterCallback(%02i:%s, %i, " P_INTPTR ", %p, %f) UNDEF", opcode, vstMasterOpcode2str(opcode), index, value, ptr, opt);
carla_debug("CarlaPluginVST2::handleAudioMasterCallback(%02i:%s, %i, " P_INTPTR ", %p, %f) UNDEF",
opcode, vstMasterOpcode2str(opcode), index, value, ptr, static_cast<double>(opt));
break;
}

@@ -2632,7 +2635,8 @@ private:
{
#if defined(DEBUG) && ! defined(CARLA_OS_WIN)
if (opcode != audioMasterGetTime && opcode != audioMasterProcessEvents && opcode != audioMasterGetCurrentProcessLevel && opcode != audioMasterGetOutputLatency)
carla_debug("carla_vst_audioMasterCallback(%p, %02i:%s, %i, " P_INTPTR ", %p, %f)", effect, opcode, vstMasterOpcode2str(opcode), index, value, ptr, opt);
carla_debug("carla_vst_audioMasterCallback(%p, %02i:%s, %i, " P_INTPTR ", %p, %f)",
effect, opcode, vstMasterOpcode2str(opcode), index, value, ptr, static_cast<double>(opt));
#endif

switch (opcode)


+ 1
- 1
source/bridges-plugin/CarlaBridgePlugin.cpp View File

@@ -344,7 +344,7 @@ private:
{
carla_debug("CarlaBridgePlugin::callback(%p, %i:%s, %i, %i, %i, %i, %f, \"%s\")",
ptr, action, EngineCallbackOpcode2Str(action),
pluginId, value1, value2, value3, valuef, valueStr);
pluginId, value1, value2, value3, static_cast<double>(valuef), valueStr);

// ptr must not be null
CARLA_SAFE_ASSERT_RETURN(ptr != nullptr,);


+ 3
- 1
source/native-plugins/audio-base.hpp View File

@@ -338,7 +338,9 @@ public:
carla_zeroFloats(fPollTempData, fPollTempSize);

{
carla_debug("R: poll data - reading at %li:%02li", readFrame/fPool.sampleRate/60, (readFrame/fPool.sampleRate) % 60);
carla_debug("R: poll data - reading at %li:%02li",
readFrame/static_cast<int32_t>(fPool.sampleRate)/60,
(readFrame/static_cast<int32_t>(fPool.sampleRate)) % 60);

ad_seek(fFilePtr, readFrame);
size_t i = 0;


+ 1
- 1
source/native-plugins/midi-pattern.cpp View File

@@ -363,7 +363,7 @@ protected:

#ifdef DEBUG
carla_stdout("Playing at %f :: %03X:%03i:%03i",
float(double(midiEvent.time)*fTicksPerFrame),
static_cast<double>(midiEvent.time)*fTicksPerFrame,
midiEvent.data[0], midiEvent.data[1], midiEvent.data[2]);
#endif



+ 2
- 1
source/plugin/carla-lv2.cpp View File

@@ -765,7 +765,8 @@ protected:

intptr_t handleDispatcher(const NativeHostDispatcherOpcode opcode, const int32_t index, const intptr_t value, void* const ptr, const float opt)
{
carla_debug("NativePlugin::handleDispatcher(%i, %i, " P_INTPTR ", %p, %f)", opcode, index, value, ptr, opt);
carla_debug("NativePlugin::handleDispatcher(%i, %i, " P_INTPTR ", %p, %f)",
opcode, index, value, ptr, static_cast<double>(opt));

intptr_t ret = 0;



+ 2
- 1
source/plugin/carla-vst.cpp View File

@@ -749,7 +749,8 @@ protected:

intptr_t handleDispatcher(const NativeHostDispatcherOpcode opcode, const int32_t index, const intptr_t value, void* const ptr, const float opt)
{
carla_debug("NativePlugin::handleDispatcher(%i, %i, " P_INTPTR ", %p, %f)", opcode, index, value, ptr, opt);
carla_debug("NativePlugin::handleDispatcher(%i, %i, " P_INTPTR ", %p, %f)",
opcode, index, value, ptr, static_cast<double>(opt));

switch (opcode)
{


Loading…
Cancel
Save