More Carla work

src/carla/carla_jack.cpp

@@ -25,7 +25,9 @@ static jack_nframes_t carla_sample_rate = 44100;
 static jack_position_t carla_jack_pos;
 static jack_transport_state_t carla_jack_state;
 
-const char* carla_client_name = nullptr;
+static bool carla_jack_is_freewheel = false;
+static const char* carla_client_name = nullptr;
+static QThread* carla_jack_thread = nullptr;
 
 // -------------------------------------------------------------------------------------------------------------------
 // Exported symbols (API)
@@ -87,8 +89,15 @@ static int carla_jack_srate_callback(jack_nframes_t new_sample_rate, void*)
     return 0;
 }
 
+static void carla_jack_freewheel_callback(int starting, void*)
+{
+    carla_jack_is_freewheel = (starting != 0);
+}
+
 static int carla_jack_process_callback(jack_nframes_t nframes, void* arg)
 {
+    carla_jack_thread = QThread::currentThread();
+
     // request time info once (arg only null on global client)
     if (carla_jack_client && arg == nullptr)
         carla_jack_state = jack_transport_query(carla_jack_client, &carla_jack_pos);
@@ -152,6 +161,7 @@ bool carla_jack_init(const char* client_name)
 #ifndef BUILD_BRIDGE
         jack_set_buffer_size_callback(carla_jack_client, carla_jack_bufsize_callback, nullptr);
         jack_set_sample_rate_callback(carla_jack_client, carla_jack_srate_callback, nullptr);
+        jack_set_freewheel_callback(carla_jack_client, carla_jack_freewheel_callback, nullptr);
         jack_set_process_callback(carla_jack_client, carla_jack_process_callback, nullptr);
         jack_on_shutdown(carla_jack_client, carla_jack_shutdown_callback, nullptr);
 
@@ -246,3 +256,13 @@ bool carla_jack_transport_query(jack_position_t** pos)
     *pos = &carla_jack_pos;
     return (carla_jack_state != JackTransportStopped);
 }
+
+bool carla_jack_on_audio_thread()
+{
+    return (QThread::currentThread() == carla_jack_thread);
+}
+
+bool carla_jack_on_freewheel()
+{
+    return carla_jack_is_freewheel;
+}

src/carla/carla_jack.h

@@ -29,5 +29,7 @@ bool carla_jack_init(const char* client_name);
 bool carla_jack_close();
 bool carla_jack_register_plugin(CarlaPlugin* plugin, jack_client_t** client);
 bool carla_jack_transport_query(jack_position_t** pos);
+bool carla_jack_on_audio_thread();
+bool carla_jack_on_freewheel();
 
 #endif // CARLA_JACK_H

src/carla/carla_osc.cpp

@@ -384,31 +384,30 @@ int osc_handle_program_as_midi(CarlaPlugin* plugin, lo_arg** argv)
     return 1;
 }
 
-int osc_handle_midi(CarlaPlugin *plugin, lo_arg **argv)
+int osc_handle_midi(CarlaPlugin* plugin, lo_arg **argv)
 {
     qDebug("osc_handle_midi()");
 
-    // FIXME - verify this midi stuff when sure about the bytes
-
     if (plugin->min_count() > 0)
     {
-        uint8_t* data = argv[0]->m;
-        uint8_t mode = data[1] & 0xff;
-        uint8_t note = data[2] & 0x7f;
-        uint8_t velo = data[3] & 0x7f;
+        uint8_t* data  = argv[0]->m;
+        uint8_t status = data[1];
 
-        // only receive notes
-        if (mode < 0x80 || mode > 0x9F)
-            return 1;
+        // Fix bad note-off
+        if (MIDI_IS_STATUS_NOTE_ON(status) && data[3] == 0)
+            status -= 0x10;
 
-        // fix bad note off
-        if (mode >= 0x90 && velo == 0)
+        if (MIDI_IS_STATUS_NOTE_OFF(status))
         {
-            mode -= 0x10;
-            velo = 0x64;
+            uint8_t note = data[2];
+            plugin->send_midi_note(false, note, 0, false, true, true);
+        }
+        else if (MIDI_IS_STATUS_NOTE_ON(status))
+        {
+            uint8_t note = data[2];
+            uint8_t velo = data[3];
+            plugin->send_midi_note(true, note, velo, false, true, true);
         }
-
-        plugin->send_midi_note((mode >= 0x90), note, velo, false, true, true);
 
         return 0;
     }

src/carla/dssi.cpp

@@ -181,29 +181,33 @@ public:
 
     void set_midi_program(int32_t index, bool gui_send, bool osc_send, bool callback_send, bool block)
     {
-        if (! descriptor->select_program)
-            return;
-
-        // TODO - don't block when freewheeling
         if (index >= 0)
         {
-            // block plugin so we don't change programs during run()
-            short _id = m_id;
-
-            if (block)
+            if (carla_jack_on_freewheel())
             {
-                carla_proc_lock();
-                m_id = -1;
-                carla_proc_unlock();
+                if (block) carla_proc_lock();
+                descriptor->select_program(handle, midiprog.data[index].bank, midiprog.data[index].program);
+                if (block) carla_proc_unlock();
             }
+            else
+            {
+                short _id = m_id;
+
+                if (block)
+                {
+                    carla_proc_lock();
+                    m_id = -1;
+                    carla_proc_unlock();
+                }
 
-            descriptor->select_program(handle, midiprog.data[index].bank, midiprog.data[index].program);
+                descriptor->select_program(handle, midiprog.data[index].bank, midiprog.data[index].program);
 
-            if (block)
-            {
-                carla_proc_lock();
-                m_id = _id;
-                carla_proc_unlock();
+                if (block)
+                {
+                    carla_proc_lock();
+                    m_id = _id;
+                    carla_proc_unlock();
+                }
             }
 
 #ifndef BUILD_BRIDGE
@@ -888,7 +892,7 @@ public:
                 else if (MIDI_IS_STATUS_PROGRAM_CHANGE(status))
                 {
                     uint32_t mbank_id = next_bank_id;
-                    uint32_t mprog_id = pin_event.buffer[1]; // & 0x7F;
+                    uint32_t mprog_id = pin_event.buffer[1];
 
                     for (k=0; k < midiprog.count; k++)
                     {
@@ -955,10 +959,7 @@ public:
 
                 // Fix bad note-off
                 if (MIDI_IS_STATUS_NOTE_ON(status) && min_event.buffer[2] == 0)
-                {
-                    min_event.buffer[0] -= 0x10;
-                    status = min_event.buffer[0];
-                }
+                    status -= 0x10;
 
                 snd_seq_event_t* midi_event = &midi_events[midi_event_count];
                 memset(midi_event, 0, sizeof(snd_seq_event_t));

src/carla/lv2_rdf.h

@@ -167,7 +167,7 @@ struct LV2_RDF_PortScalePoint {
 #define LV2_PORT_CONTINUOUS_CV           0x0040
 #define LV2_PORT_DISCRETE_CV             0x0080
 #define LV2_PORT_EXPENSIVE               0x0100
-#define LV2_PORT_HAS_STRICT_BOUNDS       0x0200
+#define LV2_PORT_STRICT_BOUNDS           0x0200
 #define LV2_PORT_LOGARITHMIC             0x0400
 #define LV2_PORT_NOT_AUTOMATIC           0x0800
 #define LV2_PORT_NOT_ON_GUI              0x1000
@@ -182,7 +182,7 @@ struct LV2_RDF_PortScalePoint {
 #define LV2_IS_PORT_CONTINUOUS_CV(x)     ((x) & LV2_PORT_CONTINUOUS_CV)
 #define LV2_IS_PORT_DISCRETE_CV(x)       ((x) & LV2_PORT_DISCRETE_CV)
 #define LV2_IS_PORT_EXPENSIVE(x)         ((x) & LV2_PORT_EXPENSIVE)
-#define LV2_IS_PORT_HAS_STRICT_BOUNDS(x) ((x) & LV2_PORT_HAS_STRICT_BOUNDS)
+#define LV2_IS_PORT_STRICT_BOUNDS(x)     ((x) & LV2_PORT_STRICT_BOUNDS)
 #define LV2_IS_PORT_LOGARITHMIC(x)       ((x) & LV2_PORT_LOGARITHMIC)
 #define LV2_IS_PORT_NOT_AUTOMATIC(x)     ((x) & LV2_PORT_NOT_AUTOMATIC)
 #define LV2_IS_PORT_NOT_ON_GUI(x)        ((x) & LV2_PORT_NOT_ON_GUI)
@@ -663,6 +663,16 @@ public:
     Lilv::Node doap_license;
     Lilv::Node rdf_type;
     Lilv::Node rdfs_label;
+
+    void init()
+    {
+        static bool need_init = true;
+        if (need_init)
+        {
+            need_init = false;
+            load_all();
+        }
+    }
 };
 
 static Lv2WorldClass Lv2World;
@@ -904,7 +914,7 @@ inline const LV2_RDF_Descriptor* lv2_rdf_new(const char* URI)
                     if (Port.has_property(Lv2World.pprop_expensive))
                         RDF_Port->Properties = LV2_PORT_EXPENSIVE;
                     if (Port.has_property(Lv2World.pprop_strict_bounds))
-                        RDF_Port->Properties = LV2_PORT_HAS_STRICT_BOUNDS;
+                        RDF_Port->Properties = LV2_PORT_STRICT_BOUNDS;
                     if (Port.has_property(Lv2World.pprop_logarithmic))
                         RDF_Port->Properties = LV2_PORT_LOGARITHMIC;
                     if (Port.has_property(Lv2World.pprop_not_automatic))

src/carla/qtcreator/carla-backend.pro

@@ -35,7 +35,8 @@ HEADERS = \
     ../../carla-includes/carla_includes.h
 
 INCLUDEPATH = .. \
-    ../../carla-includes
+    ../../carla-includes \
+    ../../carla-includes/vst
 #    ../../carla-includes/vestige
 
 TARGET  = carla_backend

src/carla/sf2.cpp

@@ -47,7 +47,7 @@ public:
         param_buffers = nullptr;
     }
 
-    virtual ~Sf2Plugin()
+    ~Sf2Plugin()
     {
         qDebug("Sf2Plugin::~Sf2Plugin()");
 
@@ -58,12 +58,12 @@ public:
         delete_fluid_settings(f_settings);
     }
 
-    virtual PluginCategory category()
+    PluginCategory category()
     {
         return PLUGIN_CATEGORY_SYNTH;
     }
 
-    virtual uint32_t param_scalepoint_count(uint32_t param_id)
+    uint32_t param_scalepoint_count(uint32_t param_id)
     {
         switch (param_id)
         {
@@ -76,12 +76,12 @@ public:
         }
     }
 
-    virtual double get_parameter_value(uint32_t param_id)
+    double get_parameter_value(uint32_t param_id)
     {
         return param_buffers[param_id];
     }
 
-    virtual double get_parameter_scalepoint_value(uint32_t param_id, uint32_t scalepoint_id)
+    double get_parameter_scalepoint_value(uint32_t param_id, uint32_t scalepoint_id)
     {
         switch (param_id)
         {
@@ -114,7 +114,7 @@ public:
         }
     }
 
-    virtual void get_label(char* buf_str)
+    void get_label(char* buf_str)
     {
         strncpy(buf_str, m_label, STR_MAX);
     }
@@ -126,7 +126,7 @@ public:
 //        //f_sfont->free(f_sfont);
 //    }
 
-    virtual void get_parameter_name(uint32_t param_id, char* buf_str)
+    void get_parameter_name(uint32_t param_id, char* buf_str)
     {
         switch (param_id)
         {
@@ -178,7 +178,7 @@ public:
         }
     }
 
-    virtual void get_parameter_label(uint32_t param_id, char* buf_str)
+    void get_parameter_unit(uint32_t param_id, char* buf_str)
     {
         switch (param_id)
         {
@@ -194,7 +194,7 @@ public:
         }
     }
 
-    virtual void get_parameter_scalepoint_label(uint32_t param_id, uint32_t scalepoint_id, char* buf_str)
+    void get_parameter_scalepoint_label(uint32_t param_id, uint32_t scalepoint_id, char* buf_str)
     {
         switch (param_id)
         {
@@ -228,7 +228,7 @@ public:
         *buf_str = 0;
     }
 
-    virtual void set_parameter_value(uint32_t param_id, double value, bool gui_send, bool osc_send, bool callback_send)
+    void set_parameter_value(uint32_t param_id, double value, bool gui_send, bool osc_send, bool callback_send)
     {
         param_buffers[param_id] = value;
 
@@ -269,17 +269,44 @@ public:
         CarlaPlugin::set_parameter_value(param_id, value, gui_send, osc_send, callback_send);
     }
 
-    virtual void set_midi_program(int32_t index, bool gui_send, bool osc_send, bool callback_send, bool block)
+    void set_midi_program(int32_t index, bool gui_send, bool osc_send, bool callback_send, bool block)
     {
         if (index >= 0)
-            fluid_synth_program_select(f_synth, 0, f_id, midiprog.data[index].bank, midiprog.data[index].program);
+        {
+            if (carla_jack_on_freewheel())
+            {
+                if (block) carla_proc_lock();
+                fluid_synth_program_select(f_synth, 0, f_id, midiprog.data[index].bank, midiprog.data[index].program);
+                if (block) carla_proc_unlock();
+            }
+            else
+            {
+                short _id = m_id;
+
+                if (block)
+                {
+                    carla_proc_lock();
+                    m_id = -1;
+                    carla_proc_unlock();
+                }
+
+                fluid_synth_program_select(f_synth, 0, f_id, midiprog.data[index].bank, midiprog.data[index].program);
+
+                if (block)
+                {
+                    carla_proc_lock();
+                    m_id = _id;
+                    carla_proc_unlock();
+                }
+            }
+        }
 
         CarlaPlugin::set_midi_program(index, gui_send, osc_send, callback_send, block);
     }
 
-    virtual void reload()
+    void reload()
     {
-        qDebug("Sf2AudioPlugin::reload()");
+        qDebug("Sf2AudioPlugin::reload() - start");
         short _id = m_id;
 
         // Safely disable plugin for reload
@@ -288,8 +315,7 @@ public:
         carla_proc_unlock();
 
         // Unregister previous jack ports if needed
-        if (_id >= 0)
-            remove_from_jack();
+        remove_from_jack(bool(_id >= 0));
 
         // Delete old data
         delete_buffers();
@@ -299,12 +325,13 @@ public:
         params = Sf2ParametersMax;
 
         aout.ports    = new jack_port_t*[aouts];
+        aout.rindexes = new uint32_t[aouts];
 
         param.data    = new ParameterData[params];
         param.ranges  = new ParameterRanges[params];
         param_buffers = new double[params];
 
-        const int port_name_size = jack_port_name_size();
+        const int port_name_size = jack_port_name_size() - 1;
         char port_name[port_name_size];
 
         // ---------------------------------------
@@ -320,7 +347,8 @@ public:
 #endif
             strcpy(port_name, "out-left");
 
-        aout.ports[0] = jack_port_register(jack_client, port_name, JACK_DEFAULT_AUDIO_TYPE, JackPortIsOutput, 0);
+        aout.ports[0]    = jack_port_register(jack_client, port_name, JACK_DEFAULT_AUDIO_TYPE, JackPortIsOutput, 0);
+        aout.rindexes[0] = 0;
 
 #ifndef BUILD_BRIDGE
         if (carla_options.global_jack_client)
@@ -332,7 +360,8 @@ public:
 #endif
             strcpy(port_name, "out-right");
 
-        aout.ports[1] = jack_port_register(jack_client, port_name, JACK_DEFAULT_AUDIO_TYPE, JackPortIsOutput, 0);
+        aout.ports[1]    = jack_port_register(jack_client, port_name, JACK_DEFAULT_AUDIO_TYPE, JackPortIsOutput, 0);
+        aout.rindexes[1] = 1;
 
         // ---------------------------------------
         // MIDI Input
@@ -381,7 +410,7 @@ public:
         param.data[j].index  = j;
         param.data[j].rindex = j;
         param.data[j].type   = PARAMETER_INPUT;
-        param.data[j].hints  = PARAMETER_IS_ENABLED | PARAMETER_IS_AUTOMABLE;
+        param.data[j].hints  = PARAMETER_IS_ENABLED | PARAMETER_IS_AUTOMABLE | PARAMETER_IS_BOOLEAN;
         param.data[j].midi_channel = 0;
         param.data[j].midi_cc = -1;
         param.ranges[j].min = 0.0;
@@ -461,7 +490,7 @@ public:
         param.data[j].index  = j;
         param.data[j].rindex = j;
         param.data[j].type   = PARAMETER_INPUT;
-        param.data[j].hints  = PARAMETER_IS_ENABLED | PARAMETER_IS_AUTOMABLE;
+        param.data[j].hints  = PARAMETER_IS_ENABLED | PARAMETER_IS_AUTOMABLE | PARAMETER_IS_BOOLEAN;
         param.data[j].midi_channel = 0;
         param.data[j].midi_cc = -1;
         param.ranges[j].min = 0.0;
@@ -477,7 +506,7 @@ public:
         param.data[j].index  = j;
         param.data[j].rindex = j;
         param.data[j].type   = PARAMETER_INPUT;
-        param.data[j].hints  = PARAMETER_IS_ENABLED | PARAMETER_IS_AUTOMABLE;
+        param.data[j].hints  = PARAMETER_IS_ENABLED | PARAMETER_IS_AUTOMABLE | PARAMETER_IS_INTEGER;
         param.data[j].midi_channel = 0;
         param.data[j].midi_cc = -1;
         param.ranges[j].min = 0.0;
@@ -541,7 +570,7 @@ public:
         param.data[j].index  = j;
         param.data[j].rindex = j;
         param.data[j].type   = PARAMETER_INPUT;
-        param.data[j].hints  = PARAMETER_IS_ENABLED | PARAMETER_USES_SCALEPOINTS;
+        param.data[j].hints  = PARAMETER_IS_ENABLED | PARAMETER_IS_INTEGER | PARAMETER_USES_SCALEPOINTS;
         param.data[j].midi_channel = 0;
         param.data[j].midi_cc = -1;
         param.ranges[j].min = FLUID_CHORUS_MOD_SINE;
@@ -557,7 +586,7 @@ public:
         param.data[j].index  = j;
         param.data[j].rindex = j;
         param.data[j].type   = PARAMETER_INPUT;
-        param.data[j].hints  = PARAMETER_IS_ENABLED;
+        param.data[j].hints  = PARAMETER_IS_ENABLED | PARAMETER_IS_INTEGER;
         param.data[j].midi_channel = 0;
         param.data[j].midi_cc = -1;
         param.ranges[j].min = 1;
@@ -573,7 +602,7 @@ public:
         param.data[j].index  = j;
         param.data[j].rindex = j;
         param.data[j].type   = PARAMETER_INPUT;
-        param.data[j].hints  = PARAMETER_IS_ENABLED | PARAMETER_USES_SCALEPOINTS;
+        param.data[j].hints  = PARAMETER_IS_ENABLED | PARAMETER_IS_INTEGER | PARAMETER_USES_SCALEPOINTS;
         param.data[j].midi_channel = 0;
         param.data[j].midi_cc = -1;
         param.ranges[j].min = FLUID_INTERP_NONE;
@@ -589,7 +618,7 @@ public:
         param.data[j].index  = j;
         param.data[j].rindex = j;
         param.data[j].type   = PARAMETER_OUTPUT;
-        param.data[j].hints  = PARAMETER_IS_ENABLED | PARAMETER_IS_AUTOMABLE;
+        param.data[j].hints  = PARAMETER_IS_ENABLED | PARAMETER_IS_AUTOMABLE | PARAMETER_IS_INTEGER;
         param.data[j].midi_channel = 0;
         param.data[j].midi_cc = -1;
         param.ranges[j].min = 0;
@@ -622,6 +651,8 @@ public:
         if (carla_options.global_jack_client == false)
 #endif
             jack_activate(jack_client);
+
+        qDebug("Sf2AudioPlugin::reload() - end");
     }
 
     virtual void reload_programs(bool init)
@@ -668,18 +699,19 @@ public:
             i++;
         }
 
+        // TODO - for xx(), rest of i < count to null
+
         //f_sfont->free(f_sfont);
 
+#ifndef BUILD_BRIDGE
         // Update OSC Names
         osc_global_send_set_midi_program_count(m_id, midiprog.count);
 
-        if (midiprog.count > 0)
-        {
-            for (i=0; i < midiprog.count; i++)
-                osc_global_send_set_midi_program_data(m_id, i, midiprog.data[i].bank, midiprog.data[i].program, midiprog.data[i].name);
-        }
+        for (i=0; i < midiprog.count; i++)
+            osc_global_send_set_midi_program_data(m_id, i, midiprog.data[i].bank, midiprog.data[i].program, midiprog.data[i].name);
 
         callback_action(CALLBACK_RELOAD_PROGRAMS, m_id, 0, 0, 0.0);
+#endif
 
         if (init)
         {
@@ -709,11 +741,11 @@ public:
 
         double aouts_peak_tmp[2] = { 0.0 };
 
-        jack_default_audio_sample_t* aouts_buffer[aout.count];
+        jack_audio_sample_t* aouts_buffer[aout.count];
         void* min_buffer;
 
         for (i=0; i < aout.count; i++)
-            aouts_buffer[i] = (jack_default_audio_sample_t*)jack_port_get_buffer(aout.ports[i], nframes);
+            aouts_buffer[i] = (jack_audio_sample_t*)jack_port_get_buffer(aout.ports[i], nframes);
 
         min_buffer = jack_port_get_buffer(midi.port_min, nframes);
 
@@ -730,7 +762,7 @@ public:
 
             unsigned char next_bank_ids[16] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 0, 0, 0, 0, 0, 0 };
 
-            if (midiprog.current > 0)
+            if (midiprog.current > 0 && midiprog.count > 0)
                 next_bank_ids[0] = midiprog.data[midiprog.current].bank;
 
             for (i=0; i < n_pin_events; i++)
@@ -738,8 +770,8 @@ public:
                 if (jack_midi_event_get(&pin_event, pin_buffer, i) != 0)
                     break;
 
-                jack_midi_data_t status = pin_event.buffer[0];
-                unsigned char channel   = status & 0x0F;
+                jack_midi_data_t status  = pin_event.buffer[0];
+                jack_midi_data_t channel = status & 0x0F;
 
                 // Control change
                 if (MIDI_IS_STATUS_CONTROL_CHANGE(status))
@@ -756,8 +788,8 @@ public:
 
                     double value;
 
-                    // Control GUI stuff (channel 0 only)
-                    if (channel == 0)
+                    // Control backend stuff
+                    if (channel == cin_channel)
                     {
                         if (MIDI_IS_CONTROL_BREATH_CONTROLLER(control) && (m_hints & PLUGIN_CAN_DRYWET) > 0)
                         {
@@ -819,7 +851,7 @@ public:
                         }
                     }
 #ifdef FLUIDSYNTH_VERSION_113
-                    else // not channel 0
+                    else // not channel for backend
                     {
                         if (control == MIDI_CONTROL_ALL_SOUND_OFF)
                         {
@@ -838,9 +870,20 @@ public:
                     // Control plugin parameters
                     for (k=0; k < param.count; k++)
                     {
-                        if (param.data[k].type == PARAMETER_INPUT && (param.data[k].hints & PARAMETER_IS_AUTOMABLE) > 0 && param.data[k].midi_channel == channel && param.data[k].midi_cc == control)
+                        if (param.data[k].midi_channel == channel && param.data[k].midi_cc == control && param.data[k].type == PARAMETER_INPUT && (param.data[k].hints & PARAMETER_IS_AUTOMABLE) > 0)
                         {
-                            value = (double(c_value) / 127 * (param.ranges[k].max - param.ranges[k].min)) + param.ranges[k].min;
+                            if (param.data[k].hints & PARAMETER_IS_BOOLEAN)
+                            {
+                                value = c_value <= 63 ? param.ranges[k].min : param.ranges[k].max;
+                            }
+                            else
+                            {
+                                value = (double(c_value) / 127 * (param.ranges[k].max - param.ranges[k].min)) + param.ranges[k].min;
+
+                                if (param.data[k].hints & PARAMETER_IS_INTEGER)
+                                    value = rint(value);
+                            }
+
                             set_parameter_value(k, value, false, false, false);
                             postpone_event(PostEventParameterChange, k, value);
                         }
@@ -853,13 +896,13 @@ public:
                         continue;
 
                     uint32_t mbank_id = next_bank_ids[channel];
-                    uint32_t mprog_id = pin_event.buffer[1] & 0x7F;
+                    uint32_t mprog_id = pin_event.buffer[1];
 
                     for (k=0; k < midiprog.count; k++)
                     {
                         if (midiprog.data[k].bank == mbank_id && midiprog.data[k].program == mprog_id)
                         {
-                            if (channel == 0)
+                            if (channel == cin_channel)
                             {
                                 set_midi_program(k, false, false, false, false);
                                 postpone_event(PostEventMidiProgramChange, k, 0.0);
@@ -891,8 +934,6 @@ public:
                     else
                         fluid_synth_noteoff(f_synth, 0, ext_midi_notes[i].note);
 
-                    //fluid_synth_write_float(f_synth, nframes, aouts_buffer[0], 0, 1, aouts_buffer[1], 0, 1);
-
                     ext_midi_notes[i].valid = false;
                     midi_event_count += 1;
                 }
@@ -907,10 +948,9 @@ public:
         CARLA_PROCESS_CONTINUE_CHECK;
 
         // --------------------------------------------------------------------------------------------------------
-        // MIDI Input (JACK), Plugin processing
+        // MIDI Input (JACK)
 
         {
-            //jack_nframes_t offset = 0;
             jack_midi_event_t min_event;
             uint32_t n_min_events = jack_midi_get_event_count(min_buffer);
 
@@ -919,23 +959,12 @@ public:
                 if (jack_midi_event_get(&min_event, min_buffer, k) != 0)
                     break;
 
-                //if (min_event.time > offset)
-                //{
-                    /* generate audio up to event */
-                    //fluid_synth_write_float(f_synth, min_event.time - offset, aouts_buffer[0] + offset, 0, 1, aouts_buffer[1] + offset, 0, 1);
-
-                    //offset = min_event.time;
-                //}
-
-                jack_midi_data_t status = min_event.buffer[0];
-                unsigned char channel   = status & 0x0F;
+                jack_midi_data_t status  = min_event.buffer[0];
+                jack_midi_data_t channel = status & 0x0F;
 
                 // Fix bad note-off
                 if (MIDI_IS_STATUS_NOTE_ON(status) && min_event.buffer[2] == 0)
-                {
-                    min_event.buffer[0] -= 0x10;
-                    status = min_event.buffer[0];
-                }
+                    status -= 0x10;
 
                 if (MIDI_IS_STATUS_NOTE_OFF(status))
                 {
@@ -968,12 +997,7 @@ public:
 
                 midi_event_count += 1;
             }
-
-            //if (nframes > offset)
-            //{
-            //    fluid_synth_write_float(f_synth, nframes - offset, aouts_buffer[0] + offset, 0, 1, aouts_buffer[1] + offset, 0, 1);
-            //}
-        } // End of MIDI Input (JACK), Plugin processing
+        } // End of MIDI Input (JACK)
 
         CARLA_PROCESS_CONTINUE_CHECK;
 
@@ -990,8 +1014,10 @@ public:
 
         if (m_active)
         {
+            bool do_balance = (m_hints & PLUGIN_CAN_BALANCE) > 0 && (x_bal_left != -1.0 || x_bal_right != 1.0);
+
             double bal_rangeL, bal_rangeR;
-            jack_default_audio_sample_t old_bal_left[nframes];
+            jack_audio_sample_t old_bal_left[nframes];
 
             for (i=0; i < aout.count; i++)
             {
@@ -999,10 +1025,10 @@ public:
                 fluid_synth_set_gain(f_synth, x_vol);
 
                 // Balance
-                if (m_hints & PLUGIN_CAN_BALANCE)
+                if (do_balance)
                 {
                     if (i%2 == 0)
-                        memcpy(&old_bal_left, aouts_buffer[i], sizeof(jack_default_audio_sample_t)*nframes);
+                        memcpy(&old_bal_left, aouts_buffer[i], sizeof(jack_audio_sample_t)*nframes);
 
                     bal_rangeL = (x_bal_left+1.0)/2;
                     bal_rangeR = (x_bal_right+1.0)/2;
@@ -1025,13 +1051,10 @@ public:
                 }
 
                 // Output VU
-                if (i < 2)
+                for (k=0; k < nframes && i < 2; k++)
                 {
-                    for (k=0; k<nframes; k++)
-                    {
-                        if (abs_d(aouts_buffer[i][k]) > aouts_peak_tmp[i])
-                            aouts_peak_tmp[i] = abs_d(aouts_buffer[i][k]);
-                    }
+                    if (abs_d(aouts_buffer[i][k]) > aouts_peak_tmp[i])
+                        aouts_peak_tmp[i] = abs_d(aouts_buffer[i][k]);
                 }
             }
         }
@@ -1039,7 +1062,7 @@ public:
         {
             // disable any output sound if not active
             for (i=0; i < aout.count; i++)
-                memset(aouts_buffer[i], 0.0f, sizeof(jack_default_audio_sample_t)*nframes);
+                memset(aouts_buffer[i], 0.0f, sizeof(jack_audio_sample_t)*nframes);
 
             aouts_peak_tmp[0] = 0.0;
             aouts_peak_tmp[1] = 0.0;
@@ -1056,14 +1079,14 @@ public:
             jack_midi_clear_buffer(cout_buffer);
 
             k = Sf2VoiceCount;
-            param_buffers[k] = abs(fluid_synth_get_active_voice_count(f_synth));
+            param_buffers[k] = fluid_synth_get_active_voice_count(f_synth);
 
-            if (param.data[k].midi_cc >= 0)
+            if (param.data[k].midi_cc > 0)
             {
                 double value_per = (param_buffers[k] - param.ranges[k].min)/(param.ranges[k].max - param.ranges[k].min);
 
                 jack_midi_data_t* event_buffer = jack_midi_event_reserve(cout_buffer, 0, 3);
-                event_buffer[0] = 0xB0 + param.data[k].midi_channel;
+                event_buffer[0] = MIDI_STATUS_CONTROL_CHANGE + param.data[k].midi_channel;
                 event_buffer[1] = param.data[k].midi_cc;
                 event_buffer[2] = 127*value_per;
             }

src/carla/vst.cpp

@@ -48,6 +48,8 @@
 #define kPlugCategRestoration 8
 #define kPlugCategShell 10
 #define kPlugCategGenerator 11
+#define kVstProcessLevelUser 1
+#define kVstProcessLevelRealtime 2
 #define kVstProcessPrecision32 0
 #define kVstTransportChanged 1
 #define kVstVersion 2400
@@ -193,19 +195,6 @@ const char* VstOpcode2str(int32_t opcode)
     }
 }
 
-#if 1
-short add_plugin_vst(const char* filename, const char* label);
-
-int main()
-{
-    short id = add_plugin_vst("/usr/lib/vst/PingPongPan.so", "eq5");
-    set_active(id, true);
-    carla_sleep(3);
-    remove_plugin(id);
-    return 0;
-}
-#endif
-
 class VstPlugin : public CarlaPlugin
 {
 public:
@@ -358,26 +347,33 @@ public:
 
     void set_program(int32_t index, bool gui_send, bool osc_send, bool callback_send, bool block)
     {
-        // TODO - don't block when freewheeling
         if (index >= 0)
         {
-            // block plugin so we don't change programs during processReplacing()
-            short _id = m_id;
-
-            if (block)
+            if (carla_jack_on_freewheel())
             {
-                carla_proc_lock();
-                m_id = -1;
-                carla_proc_unlock();
+                if (block) carla_proc_lock();
+                effect->dispatcher(effect, effSetProgram, 0, index, nullptr, 0.0f);
+                if (block) carla_proc_unlock();
             }
+            else
+            {
+                short _id = m_id;
 
-            effect->dispatcher(effect, effSetProgram, 0, index, nullptr, 0.0f);
+                if (block)
+                {
+                    carla_proc_lock();
+                    m_id = -1;
+                    carla_proc_unlock();
+                }
 
-            if (block)
-            {
-                carla_proc_lock();
-                m_id = _id;
-                carla_proc_unlock();
+                effect->dispatcher(effect, effSetProgram, 0, index, nullptr, 0.0f);
+
+                if (block)
+                {
+                    carla_proc_lock();
+                    m_id = _id;
+                    carla_proc_unlock();
+                }
             }
         }
 
@@ -978,7 +974,7 @@ public:
                 // Program change
                 else if (MIDI_IS_STATUS_PROGRAM_CHANGE(status))
                 {
-                    uint32_t prog_id = pin_event.buffer[1]; // & 0x7F;
+                    uint32_t prog_id = pin_event.buffer[1];
 
                     if (prog_id < prog.count)
                     {
@@ -1041,10 +1037,7 @@ public:
 
                 // Fix bad note-off
                 if (MIDI_IS_STATUS_NOTE_ON(status) && min_event.buffer[2] == 0)
-                {
-                    min_event.buffer[0] -= 0x10;
-                    status = min_event.buffer[0];
-                }
+                    status -= 0x10;
 
                 VstMidiEvent* midi_event = &midi_events[midi_event_count];
                 memset(midi_event, 0, sizeof(VstMidiEvent));
@@ -1363,7 +1356,9 @@ public:
 
     static intptr_t VstHostCallback(AEffect* effect, int32_t opcode, int32_t index, intptr_t value, void* ptr, float opt)
     {
+#if DEBUG
         qDebug("VstHostCallback() - code: %s, index: %i, value: " P_INTPTR ", opt: %f", VstOpcode2str(opcode), index, value, opt);
+#endif
 
         // Check if 'user' points to this plugin
         VstPlugin* self = nullptr;
@@ -1379,7 +1374,15 @@ public:
         {
         case audioMasterAutomate:
             if (self)
-                self->set_parameter_value(index, opt, false, true, true);
+            {
+                if (carla_jack_on_audio_thread())
+                {
+                    self->set_parameter_value(index, opt, false, false, false);
+                    self->postpone_event(PostEventParameterChange, index, opt);
+                }
+                else
+                    self->set_parameter_value(index, opt, false, true, true);
+            }
             break;
 
         case audioMasterVersion:
@@ -1596,11 +1599,18 @@ public:
         case audioMasterWillReplaceOrAccumulate:
             // Deprecated in VST SDK 2.4
             break;
+#endif
 
         case audioMasterGetCurrentProcessLevel:
-            // TODO
-            return 0;
+            if (carla_jack_on_audio_thread())
+            {
+                if (carla_jack_on_freewheel())
+                    return kVstProcessLevelOffline;
+                return 	kVstProcessLevelRealtime;
+            }
+            return 	kVstProcessLevelUser;
 
+#if 0
         case audioMasterGetAutomationState:
             // TODO
             return 0;
@@ -1683,7 +1693,7 @@ public:
                 return -1;
 
             // unimplemented
-            qWarning("VstHostCallback:audioMasterCanDo - Got uninplemented feature request '%s'", (char*)ptr);
+            qWarning("VstHostCallback:audioMasterCanDo - Got unknown feature request '%s'", (char*)ptr);
             return 0;
 
         case audioMasterGetLanguage:
@@ -1750,7 +1760,7 @@ public:
 #endif
 
         default:
-            //qDebug("VstHostCallback() - code: %s, index: %i, value: " P_INTPTR ", opt: %f", VstOpcode2str(opcode), index, value, opt);
+            qDebug("VstHostCallback() - code: %s, index: %i, value: " P_INTPTR ", opt: %f", VstOpcode2str(opcode), index, value, opt);
             break;
         }