Browse Source

More of the same

tags/v1.9.11
falkTX 6 years ago
parent
commit
c789997920
4 changed files with 11 additions and 10 deletions
  1. +2
    -1
      data/valgrind.sh
  2. +6
    -6
      source/backend/plugin/CarlaPluginJack.cpp
  3. +0
    -3
      source/backend/plugin/CarlaPluginVST2.cpp
  4. +3
    -0
      source/utils/CarlaLibCounter.hpp

+ 2
- 1
data/valgrind.sh View File

@@ -7,13 +7,14 @@ export WINEDEBUG=-all
# export PYTHONMALLOC=malloc
# export SKIP_STRIPPING=true

valgrind --tool=memcheck --leak-check=full --show-leak-kinds=all --suppressions=./data/valgrind.supp -- ./bin/carla-bridge-native internal "" carlapatchbay &
valgrind --tool=memcheck --leak-check=full --show-leak-kinds=all --track-origins=yes --suppressions=./data/valgrind.supp -- ./bin/carla-bridge-native internal "" carlapatchbay &
PID=$!

while true; do
if jack_lsp | grep -q Carla-Patchbay:output_1; then
jack_connect Carla-Patchbay:output_2 system:playback_2
jack_connect Carla-Patchbay:output_1 system:playback_1
# jack_connect Carla-Patchbay:events-out "a2j:ZynAddSubFX [129] (playback): ZynAddSubFX"
break
else
sleep 1


+ 6
- 6
source/backend/plugin/CarlaPluginJack.cpp View File

@@ -221,7 +221,7 @@ public:
{
carla_debug("CarlaPluginJack::~CarlaPluginJack()");

#ifndef BUILD_BRIDGE
#ifndef BUILD_BRIDGE_ALTERNATIVE_ARCH
// close UI
if (pData->hints & PLUGIN_HAS_CUSTOM_UI)
pData->transientTryCounter = 0;
@@ -690,7 +690,7 @@ public:
// ----------------------------------------------------------------------------------------------------
// Event Input (System)

#ifndef BUILD_BRIDGE
#ifndef BUILD_BRIDGE_ALTERNATIVE_ARCH
bool allNotesOffSent = false;
#endif
for (uint32_t i=0, numEvents=pData->event.portIn->getEventCount(); i < numEvents; ++i)
@@ -712,7 +712,7 @@ public:
break;

case kEngineControlEventTypeParameter:
#ifndef BUILD_BRIDGE
#ifndef BUILD_BRIDGE_ALTERNATIVE_ARCH
// Control backend stuff
if (event.channel == pData->ctrlChannel)
{
@@ -793,7 +793,7 @@ public:
case kEngineControlEventTypeAllNotesOff:
if (pData->options & PLUGIN_OPTION_SEND_ALL_SOUND_OFF)
{
#ifndef BUILD_BRIDGE
#ifndef BUILD_BRIDGE_ALTERNATIVE_ARCH
if (event.channel == pData->ctrlChannel && ! allNotesOffSent)
{
allNotesOffSent = true;
@@ -987,7 +987,7 @@ public:
for (uint32_t i=0; i < fInfo.aOuts; ++i)
carla_copyFloats(audioOut[i], fShmAudioPool.data + ((i + fInfo.aIns) * frames), frames);

#ifndef BUILD_BRIDGE
#ifndef BUILD_BRIDGE_ALTERNATIVE_ARCH
// --------------------------------------------------------------------------------------------------------
// Post-processing (dry/wet, volume and balance)

@@ -1310,7 +1310,7 @@ public:

// FIXME dryWet broken
pData->hints = PLUGIN_IS_BRIDGE | PLUGIN_OPTION_FIXED_BUFFERS;
#ifndef BUILD_BRIDGE
#ifndef BUILD_BRIDGE_ALTERNATIVE_ARCH
pData->hints |= /*PLUGIN_CAN_DRYWET |*/ PLUGIN_CAN_VOLUME | PLUGIN_CAN_BALANCE;
#endif
//fInfo.optionsAvailable = optionAv;


+ 0
- 3
source/backend/plugin/CarlaPluginVST2.cpp View File

@@ -2359,9 +2359,6 @@ public:
}

return true;

// unused
(void)uniqueId;
}

private:


+ 3
- 0
source/utils/CarlaLibCounter.hpp View File

@@ -104,6 +104,9 @@ public:
lib.filename = dfilename;
lib.count = 1;
lib.canDelete = canDelete;
#ifdef BUILD_BRIDGE
lib.canDelete = true;
#endif

if (fLibs.append(lib))
return libPtr;


Loading…
Cancel
Save