More work, DSSI kinda working

source/backend/Makefile.mk

@@ -18,7 +18,7 @@ LINK_FLAGS      += $(shell pkg-config --libs QtCore)
 ifeq ($(CARLA_PLUGIN_SUPPORT),true)
 # BUILD_C_FLAGS   += -DWANT_LV2
 # BUILD_CXX_FLAGS += -DWANT_LADSPA -DWANT_DSSI -DWANT_LV2 -DWANT_VST
-BUILD_CXX_FLAGS += -DWANT_LADSPA
+BUILD_CXX_FLAGS += -DWANT_LADSPA -DWANT_DSSI
 endif
 
 ifeq ($(CARLA_RTAUDIO_SUPPORT),true)

source/backend/carla_plugin.hpp

@@ -690,7 +690,7 @@ public:
     /*!
      * Tell the UI a parameter has changed.
      */
-    virtual void uiParameterChange(const uint32_t index, const double value);
+    virtual void uiParameterChange(const uint32_t index, const float value);
 
     /*!
      * Tell the UI the current program has changed.

source/backend/engine/carla_engine_osc.cpp

@@ -436,7 +436,7 @@ int CarlaEngineOsc::handleMsgConfigure(CARLA_ENGINE_OSC_HANDLE_ARGS2)
     const char* const value = (const char*)&argv[1]->s;
 
     // FIXME
-    plugin->setCustomData("CUSTOM_DATA_STRING", key, value, false);
+    plugin->setCustomData(CUSTOM_DATA_STRING, key, value, false);
 
     return 0;
 }

source/backend/plugin/carla_plugin.cpp

@@ -672,7 +672,7 @@ void CarlaPlugin::setCustomData(const char* const type, const char* const key, c
     if (std::strcmp(type, CUSTOM_DATA_STRING) == 0)
     {
         // Ignore some keys
-        if (strncmp(key, "OSC:", 4) == 0 || std::strcmp(key, "guiVisible") == 0)
+        if (std::strncmp(key, "OSC:", 4) == 0 || std::strcmp(key, "guiVisible") == 0)
             saveData = false;
         //else if (strcmp(key, CARLA_BRIDGE_MSG_SAVE_NOW) == 0 || strcmp(key, CARLA_BRIDGE_MSG_SET_CHUNK) == 0 || strcmp(key, CARLA_BRIDGE_MSG_SET_CUSTOM) == 0)
         //    saveData = false;
@@ -1316,7 +1316,7 @@ void CarlaPlugin::postRtEventsRun()
     }
 }
 
-void CarlaPlugin::uiParameterChange(const uint32_t index, const double value)
+void CarlaPlugin::uiParameterChange(const uint32_t index, const float value)
 {
     CARLA_ASSERT(index < parameterCount());
     return;

source/backend/plugin/carla_plugin.pro

@@ -7,8 +7,8 @@ DEFINES   = DEBUG
 DEFINES  += QTCREATOR_TEST
 
 # Plugins
-DEFINES  += WANT_LADSPA
-# WANT_DSSI WANT_LV2 WANT_VST
+DEFINES  += WANT_LADSPA WANT_DSSI
+# WANT_LV2 WANT_VST
 
 # Samplers
 #DEFINES  += WANT_FLUIDSYNTH WANT_LINUXSAMPLER

source/backend/plugin/carla_plugin_internal.hpp

@@ -70,6 +70,14 @@ enum PluginBridgeInfoType {
 
 // -----------------------------------------------------------------------
 
+const unsigned short MAX_RT_EVENTS   = 128;
+const unsigned short MAX_MIDI_EVENTS = 512;
+
+const unsigned int PLUGIN_HINT_HAS_MIDI_IN  = 0x1;
+const unsigned int PLUGIN_HINT_HAS_MIDI_OUT = 0x2;
+
+// -----------------------------------------------------------------------
+
 struct PluginAudioPort {
     uint32_t rindex;
     CarlaEngineAudioPort* port;
@@ -398,13 +406,6 @@ private:
 
 // -----------------------------------------------------------------------
 
-const unsigned short MAX_RT_EVENTS = 128;
-
-const unsigned int PLUGIN_HINT_HAS_MIDI_IN  = 0x1;
-const unsigned int PLUGIN_HINT_HAS_MIDI_OUT = 0x2;
-
-// -----------------------------------------------------------------------
-
 struct CarlaPluginProtectedData {
     CarlaEngine* const engine;
     CarlaEngineClient* client;

source/backend/plugin/ladspa.cpp

@@ -761,8 +761,6 @@ public:
             return;
         }
 
-        CARLA_PROCESS_CONTINUE_CHECK;
-
         // --------------------------------------------------------------------------------------------------------
         // Parameters Input [Automation]
 
@@ -1114,8 +1112,8 @@ public:
     {
         CARLA_ASSERT(kData->engine != nullptr);
         CARLA_ASSERT(kData->client == nullptr);
-        CARLA_ASSERT(filename);
-        CARLA_ASSERT(label);
+        CARLA_ASSERT(filename != nullptr);
+        CARLA_ASSERT(label != nullptr);
 
         // ---------------------------------------------------------------
         // open DLL
@@ -1143,9 +1141,7 @@ public:
         unsigned long i = 0;
         while ((fDescriptor = descFn(i++)) != nullptr)
         {
-            if (fDescriptor->Label == nullptr)
-                continue;
-            if (std::strcmp(fDescriptor->Label, label) == 0)
+            if (fDescriptor->Label != nullptr && std::strcmp(fDescriptor->Label, label) == 0)
                 break;
         }