Do some work on the VST class; Misc fixing

source/backend/plugin/DssiPlugin.cpp

@@ -1663,7 +1663,7 @@ public:
 
     void sampleRateChanged(const double newSampleRate) override
     {
-        CARLA_ASSERT_INT(newSampleRate > 0.0, (int)newSampleRate);
+        CARLA_ASSERT_INT(newSampleRate > 0.0, newSampleRate);
         carla_debug("DssiPlugin::sampleRateChanged(%g) - start", newSampleRate);
 
         // TODO
@@ -1764,8 +1764,9 @@ public:
             return;
 
 #if 0
-        uint8_t midiData[4] = { 0 };
-        midiData[1] = MIDI_STATUS_NOTE_ON + channel;
+        uint8_t midiData[4];
+        midiData[0] = 0;
+        midiData[1] = static_cast<uint8_t>(MIDI_STATUS_NOTE_ON + channel);
         midiData[2] = note;
         midiData[3] = velo;
 
@@ -1782,9 +1783,11 @@ public:
             return;
 
 #if 0
-        uint8_t midiData[4] = { 0 };
-        midiData[1] = MIDI_STATUS_NOTE_OFF + channel;
+        uint8_t midiData[4];
+        midiData[0] = 0;
+        midiData[1] = static_cast<uint8_t>(MIDI_STATUS_NOTE_OFF + channel);
         midiData[2] = note;
+        midiData[3] = 0;
 
         osc_send_midi(pData->osc.data, midiData);
 #endif

source/backend/plugin/Lv2Plugin.cpp

@@ -36,6 +36,7 @@ extern "C" {
 }
 
 #include <QtCore/QDir>
+#include <QtCore/QFile>
 #include <QtCore/QUrl>
 
 // -----------------------------------------------------

source/carla_settings.py

@@ -366,7 +366,7 @@ class CarlaSettingsW(QDialog):
         lv2s    = toList(settings.value(CARLA_KEY_PATHS_LV2,    Carla.DEFAULT_LV2_PATH))
         vsts    = toList(settings.value(CARLA_KEY_PATHS_VST,    Carla.DEFAULT_VST_PATH))
         aus     = toList(settings.value(CARLA_KEY_PATHS_AU,     Carla.DEFAULT_AU_PATH))
-        csds    = toList(settings.value(CARLA_KEY_PATHS_CSOUND, Carla.DEFAULT_CSOUND_PATH))
+        csds    = toList(settings.value(CARLA_KEY_PATHS_CSD,    Carla.DEFAULT_CSOUND_PATH))
         gigs    = toList(settings.value(CARLA_KEY_PATHS_GIG,    Carla.DEFAULT_GIG_PATH))
         sf2s    = toList(settings.value(CARLA_KEY_PATHS_SF2,    Carla.DEFAULT_SF2_PATH))
         sfzs    = toList(settings.value(CARLA_KEY_PATHS_SFZ,    Carla.DEFAULT_SFZ_PATH))
@@ -502,7 +502,7 @@ class CarlaSettingsW(QDialog):
         settings.setValue(CARLA_KEY_PATHS_LV2,    lv2s)
         settings.setValue(CARLA_KEY_PATHS_VST,    vsts)
         settings.setValue(CARLA_KEY_PATHS_AU,     aus)
-        settings.setValue(CARLA_KEY_PATHS_VST,    csds)
+        settings.setValue(CARLA_KEY_PATHS_CSD,    csds)
         settings.setValue(CARLA_KEY_PATHS_GIG,    gigs)
         settings.setValue(CARLA_KEY_PATHS_SF2,    sf2s)
         settings.setValue(CARLA_KEY_PATHS_SFZ,    sfzs)

source/carla_shared.py

@@ -328,7 +328,7 @@ CARLA_KEY_PATHS_DSSI   = "Paths/DSSI"
 CARLA_KEY_PATHS_LV2    = "Paths/LV2"
 CARLA_KEY_PATHS_VST    = "Paths/VST"
 CARLA_KEY_PATHS_AU     = "Paths/AU"
-CARLA_KEY_PATHS_CSOUND = "Paths/CSOUND"
+CARLA_KEY_PATHS_CSD    = "Paths/CSD"
 CARLA_KEY_PATHS_GIG    = "Paths/GIG"
 CARLA_KEY_PATHS_SF2    = "Paths/SF2"
 CARLA_KEY_PATHS_SFZ    = "Paths/SFZ"

source/discovery/Makefile

@@ -22,11 +22,10 @@ LINK_FLAGS      += $(QTCORE_LIBS)
 BUILD_CXX_FLAGS += -DWANT_NATIVE
 
 ifeq ($(CARLA_PLUGIN_SUPPORT),true)
-BUILD_CXX_FLAGS += -DWANT_LADSPA -DWANT_DSSI -DWANT_LV2
-# -DWANT_VST
-# ifeq ($(CARLA_VESTIGE_HEADER),true)
-# BUILD_CXX_FLAGS += -DVESTIGE_HEADER
-# endif
+BUILD_CXX_FLAGS += -DWANT_LADSPA -DWANT_DSSI -DWANT_LV2 -DWANT_VST
+ifeq ($(CARLA_VESTIGE_HEADER),true)
+BUILD_CXX_FLAGS += -DVESTIGE_HEADER
+endif
 endif
 
 # --------------------------------------------------------------

source/discovery/carla-discovery.cpp

@@ -1293,7 +1293,7 @@ static void do_vst_check(void*& libHandle, const bool init)
         else
             cProduct.clear();
 
-        int hints = 0x0;
+        uint hints = 0x0;
         int audioIns = effect->numInputs;
         int audioOuts = effect->numOutputs;
         int midiIns = 0;
@@ -1365,13 +1365,13 @@ static void do_vst_check(void*& libHandle, const bool init)
 
             midiEvents[0].type = kVstMidiType;
             midiEvents[0].byteSize = sizeof(VstMidiEvent);
-            midiEvents[0].midiData[0] = MIDI_STATUS_NOTE_ON;
+            midiEvents[0].midiData[0] = char(MIDI_STATUS_NOTE_ON);
             midiEvents[0].midiData[1] = 64;
             midiEvents[0].midiData[2] = 100;
 
             midiEvents[1].type = kVstMidiType;
             midiEvents[1].byteSize = sizeof(VstMidiEvent);
-            midiEvents[1].midiData[0] = MIDI_STATUS_NOTE_OFF;
+            midiEvents[1].midiData[0] = char(MIDI_STATUS_NOTE_OFF);
             midiEvents[1].midiData[1] = 64;
             midiEvents[1].deltaFrames = kBufferSize/2;