Carla: Fix midi-program changes in lv2-ui bridges

c++/carla-backend/carla_plugin.h

@@ -1568,7 +1568,7 @@ public:
             if (m_type == PLUGIN_DSSI)
                 osc_send_program(&osc.data, midiprog.data[midiprog.current].bank, midiprog.data[midiprog.current].program);
             else
-                osc_send_midi_program(&osc.data, midiprog.current);
+                osc_send_midi_program(&osc.data, midiprog.data[midiprog.current].bank, midiprog.data[midiprog.current].program);
         }
 
         for (uint32_t i=0; i < param.count; i++)

c++/carla-backend/lv2.cpp

@@ -2562,7 +2562,7 @@ public:
         if (gui.type == GUI_EXTERNAL_OSC)
         {
             if (osc.data.target)
-                osc_send_program(&osc.data, midiprog.data[index].bank, midiprog.data[index].program);
+                osc_send_midi_program(&osc.data, midiprog.data[index].bank, midiprog.data[index].program);
         }
         else
 #endif

c++/carla-bridge/carla_bridge.h

@@ -40,7 +40,7 @@ enum MessageType {
     MESSAGE_NULL = 0,
     MESSAGE_PARAMETER,    // index, 0, value
     MESSAGE_PROGRAM,      // index, 0, 0
-    MESSAGE_MIDI_PROGRAM, // bank, program, 0
+    MESSAGE_MIDI_PROGRAM, // index, 0, 0 | bank, program, 0
     MESSAGE_NOTE_ON,      // note, velocity, 0
     MESSAGE_NOTE_OFF,     // note, 0, 0
     MESSAGE_SHOW_GUI,     // show, 0, 0

c++/carla-bridge/carla_bridge_client.h

@@ -110,7 +110,11 @@ public:
                 break;
 
             case MESSAGE_MIDI_PROGRAM:
+#ifdef BUILD_BRIDGE_PLUGIN
+                setMidiProgram(m->value1);
+#else
                 setMidiProgram(m->value1, m->value2);
+#endif
                 break;
 
             case MESSAGE_NOTE_ON:
@@ -165,7 +169,11 @@ public:
     // processing
     virtual void setParameter(const int32_t rindex, const double value) = 0;
     virtual void setProgram(const uint32_t index) = 0;
+#ifdef BUILD_BRIDGE_PLUGIN
+    virtual void setMidiProgram(const uint32_t index) = 0;
+#else
     virtual void setMidiProgram(const uint32_t bank, const uint32_t program) = 0;
+#endif
     virtual void noteOn(const uint8_t channel, const uint8_t note, const uint8_t velo) = 0;
     virtual void noteOff(const uint8_t channel, const uint8_t note) = 0;
 

c++/carla-bridge/carla_bridge_osc.cpp

@@ -261,7 +261,7 @@ int CarlaOsc::handleMsgMidiProgram(CARLA_BRIDGE_OSC_HANDLE_ARGS)
 
 #ifdef BUILD_BRIDGE_PLUGIN
     const int32_t index = argv[0]->i;
-    client->quequeMessage(MESSAGE_MIDI_PROGRAM, index, -1, 0.0);
+    client->quequeMessage(MESSAGE_MIDI_PROGRAM, index, 0, 0.0);
 #else
     const int32_t bank    = argv[0]->i;
     const int32_t program = argv[1]->i;

c++/carla-bridge/carla_bridge_plugin.cpp

@@ -137,17 +137,14 @@ public:
         }
     }
 
-    void setMidiProgram(const uint32_t index, const uint32_t test)
+    void setMidiProgram(const uint32_t index)
     {
-        qDebug("CarlaPluginClient::setMidiProgram(%i, %i)", index, test);
+        qDebug("CarlaPluginClient::setMidiProgram(%i)", index);
         Q_ASSERT(engine);
         Q_ASSERT(plugin);
-        Q_ASSERT(test == -1);
 
         if (! (plugin && engine))
             return;
-        if (test != -1)
-          return;
 
         plugin->setMidiProgram(index, true, true, false, true);
 

c++/carla-bridge/carla_bridge_ui-lv2.cpp

@@ -327,10 +327,36 @@ public:
         libClose();
     }
 
+    // ---------------------------------------------------------------------
+    // ui management
+
+    void* getWidget() const
+    {
+#ifdef BRIDGE_LV2_X11
+        return x11_widget;
+#else
+        return widget;
+#endif
+    }
+
+    bool isResizable() const
+    {
+        return m_resizable;
+    }
+
+    bool needsReparent() const
+    {
+#ifdef BRIDGE_LV2_X11
+        return true;
+#else
+        return false;
+#endif
+    }
+
     // ---------------------------------------------------------------------
     // processing
 
-    void setParameter(int32_t rindex, double value)
+    void setParameter(const int32_t rindex, const double value)
     {
         Q_ASSERT(handle && descriptor);
 
@@ -341,11 +367,11 @@ public:
         }
     }
 
-    void setProgram(uint32_t)
+    void setProgram(const uint32_t)
     {
     }
 
-    void setMidiProgram(uint32_t bank, uint32_t program)
+    void setMidiProgram(const uint32_t bank, const uint32_t program)
     {
         Q_ASSERT(handle);
 
@@ -375,32 +401,6 @@ public:
         }
     }
 
-    // ---------------------------------------------------------------------
-    // gui
-
-    void* getWidget() const
-    {
-#ifdef BRIDGE_LV2_X11
-        return x11_widget;
-#else
-        return widget;
-#endif
-    }
-
-    bool isResizable() const
-    {
-        return m_resizable;
-    }
-
-    bool needsReparent() const
-    {
-#ifdef BRIDGE_LV2_X11
-        return true;
-#else
-        return false;
-#endif
-    }
-
     // ---------------------------------------------------------------------
 
     uint32_t getCustomURID(const char* const uri)

c++/carla-bridge/carla_bridge_ui-vst.cpp

@@ -145,6 +145,24 @@ public:
         }
     }
 
+    // ---------------------------------------------------------------------
+    // ui management
+
+    void* getWidget() const
+    {
+        return widget;
+    }
+
+    bool isResizable() const
+    {
+        return false;
+    }
+
+    bool needsReparent() const
+    {
+        return true;
+    }
+
     // ---------------------------------------------------------------------
     // processing
 
@@ -172,24 +190,6 @@ public:
     {
     }
 
-    // ---------------------------------------------------------------------
-    // gui
-
-    void* getWidget() const
-    {
-        return widget;
-    }
-
-    bool isResizable() const
-    {
-        return false;
-    }
-
-    bool needsReparent() const
-    {
-        return true;
-    }
-
     // ---------------------------------------------------------------------
 
     void handleAudioMasterAutomate(const uint32_t index, const float value)

c++/carla-includes/carla_osc_includes.h

@@ -134,6 +134,23 @@ void osc_send_midi_program(const CarlaOscData* const oscData, const int32_t inde
     }
 }
 
+static inline
+void osc_send_midi_program(const CarlaOscData* const oscData, const int32_t bank, const int32_t program)
+{
+    Q_ASSERT(oscData && oscData->path);
+    Q_ASSERT(program >= 0 && program < 128);
+    Q_ASSERT(bank >= 0);
+    qDebug("osc_send_midi_program(path:\"%s\", %i, %i)", oscData->path, bank, program);
+
+    if (oscData->target)
+    {
+        char targetPath[strlen(oscData->path)+14];
+        strcpy(targetPath, oscData->path);
+        strcat(targetPath, "/midi_program");
+        lo_send(oscData->target, targetPath, "ii", bank, program);
+    }
+}
+
 static inline
 void osc_send_midi(const CarlaOscData* const oscData, const uint8_t buf[4])
 {

src/shared_carla.py

@@ -1667,7 +1667,7 @@ class PluginWidget(QFrame, ui_carla_plugin.Ui_PluginWidget):
 
     def loadStateDict(self, content):
         # ---------------------------------------------------------------------
-        # Part 1 - set custom data (non-binary/chunks)
+        # Part 1 - set custom data (except binary/chunks)
 
         for customData in content['CustomData']:
             if customData['type'] not in (CUSTOM_DATA_BINARY, CUSTOM_DATA_CHUNK):