Last minute fixes

source/backend/engine/CarlaEngine.cpp

@@ -483,10 +483,12 @@ bool CarlaEngine::addPlugin(const BinaryType btype, const PluginType ptype,
             // loading a project, revert first status if set
             else if (pData->firstLinuxSamplerInstance)
                 pData->firstLinuxSamplerInstance = false;
+#if 0
 
             // now check if bridge is needed
             if (! pData->firstLinuxSamplerInstance)
                 preferBridges = true;
+#endif
         }
     }
 #endif // ! BUILD_BRIDGE

source/backend/plugin/CarlaPluginLinuxSampler.cpp

@@ -224,7 +224,7 @@ public:
           fRealName(nullptr),
           sSampler(),
           fAudioOutputDevice(engine, this, kUses16Outs),
-          fMidiInputDevice(sSampler),
+          fMidiInputDevice(&sSampler),
           fMidiInputPort(nullptr),
           fInstrumentIds(),
           fInstrumentInfo()
@@ -232,8 +232,8 @@ public:
         carla_debug("CarlaPluginLinuxSampler::CarlaPluginLinuxSampler(%p, %i, %s, %s)", engine, id, bool2str(isGIG), bool2str(use16Outs));
 
         // TODO - option for this
-        sSampler->SetGlobalMaxStreams(LinuxSampler::kMaxStreams);
-        sSampler->SetGlobalMaxVoices(LinuxSampler::kMaxVoices);
+        sSampler.SetGlobalMaxStreams(LinuxSampler::kMaxStreams);
+        sSampler.SetGlobalMaxVoices(LinuxSampler::kMaxVoices);
 
         carla_zeroStructs(fCurProgs,        MAX_MIDI_CHANNELS);
         carla_zeroStructs(fSamplerChannels, MAX_MIDI_CHANNELS);
@@ -274,7 +274,7 @@ public:
                     fEngineChannels[i] = nullptr;
                 }
 
-                sSampler->RemoveSamplerChannel(fSamplerChannels[i]);
+                sSampler.RemoveSamplerChannel(fSamplerChannels[i]);
                 fSamplerChannels[i] = nullptr;
             }
         }
@@ -1225,7 +1225,7 @@ public:
 
         for (uint i=0; i<kMaxChannels; ++i)
         {
-            LinuxSampler::SamplerChannel* const samplerChannel(sSampler->AddSamplerChannel());
+            LinuxSampler::SamplerChannel* const samplerChannel(sSampler.AddSamplerChannel());
             CARLA_SAFE_ASSERT_CONTINUE(samplerChannel != nullptr);
 
             samplerChannel->SetEngineType(kIsGIG ? "GIG" : "SFZ");
@@ -1386,7 +1386,7 @@ private:
     uint32_t fCurProgs[MAX_MIDI_CHANNELS];
     float    fParamBuffers[LinuxSamplerParametersMax];
 
-    SharedResourcePointer<LinuxSampler::Sampler> sSampler;
+    LinuxSampler::Sampler sSampler;
 
     LinuxSampler::AudioOutputDevicePlugin fAudioOutputDevice;
     LinuxSampler::MidiInputDevicePlugin   fMidiInputDevice;

source/carla_skin.py

@@ -1123,7 +1123,7 @@ class AbstractPluginSlot(QFrame, PluginEditParentMeta):
         # Export LV2
 
         elif actSel == actExportLV2:
-            ret = QFileDialog.getSaveFileName(self, self.tr("Export Plugin as LV2"), "", "", QFileDialog.ShowDirsOnly|QFileDialog.HideNameFilterDetails)
+            ret = QFileDialog.getSaveFileName(self, self.tr("Export Plugin as LV2"), "", "", "", QFileDialog.ShowDirsOnly|QFileDialog.HideNameFilterDetails)
 
             if config_UseQt5:
                 ret = ret[0]

source/modules/rtmempool/rtmempool.c

@@ -209,7 +209,7 @@ void rtsafe_memory_pool_destroy(RtMemPool_Handle handle)
     // caller should deallocate all chunks prior releasing pool itself
     if (poolPtr->usedCount != 0)
     {
-        assert(0);
+        fprintf(stderr, "warning: rtsafe_memory_pool_destroy called with nodes still active\n");
     }
 
     while (poolPtr->unusedCount != 0)