From c789997920cadedffd21a6b4161cbd2c059a518a Mon Sep 17 00:00:00 2001
From: falkTX <falktx@gmail.com>
Date: Thu, 23 Aug 2018 02:09:13 +0200
Subject: [PATCH] More of the same

---
 data/valgrind.sh                          |  3 ++-
 source/backend/plugin/CarlaPluginJack.cpp | 12 ++++++------
 source/backend/plugin/CarlaPluginVST2.cpp |  3 ---
 source/utils/CarlaLibCounter.hpp          |  3 +++
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/data/valgrind.sh b/data/valgrind.sh
index ec38a2b1f..4a70d42ec 100755
--- a/data/valgrind.sh
+++ b/data/valgrind.sh
@@ -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
diff --git a/source/backend/plugin/CarlaPluginJack.cpp b/source/backend/plugin/CarlaPluginJack.cpp
index 96c1a1c8d..50c4ae9d3 100644
--- a/source/backend/plugin/CarlaPluginJack.cpp
+++ b/source/backend/plugin/CarlaPluginJack.cpp
@@ -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;
diff --git a/source/backend/plugin/CarlaPluginVST2.cpp b/source/backend/plugin/CarlaPluginVST2.cpp
index c133c5c97..24bb6ef49 100644
--- a/source/backend/plugin/CarlaPluginVST2.cpp
+++ b/source/backend/plugin/CarlaPluginVST2.cpp
@@ -2359,9 +2359,6 @@ public:
         }
 
         return true;
-
-        // unused
-        (void)uniqueId;
     }
 
 private:
diff --git a/source/utils/CarlaLibCounter.hpp b/source/utils/CarlaLibCounter.hpp
index 12be455bd..cb9c9aeff 100644
--- a/source/utils/CarlaLibCounter.hpp
+++ b/source/utils/CarlaLibCounter.hpp
@@ -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;