Add monitor_midi_control command, for CC feedback

Signed-off-by: falkTX <[email protected]>

Author: falkTX

README.md

@@ -217,18 +217,14 @@ The commands supported by mod-host are:
         * monitor audio levels for a specific jack port (on the feedback port)
         e.g.: monitor_audio_levels "system:capture_1" 1
 
+    monitor_midi_control <midi_channel> <enable>
+        * listen to MIDI control change messages (on the feedback port)
+        e.g.: monitor_midi_control 7 1
+
     monitor_midi_program <midi_channel> <enable>
         * listen to MIDI program change messages (on the feedback port)
         e.g.: monitor_midi_program 0 1
 
-    set_midi_program_change_pedalboard_bank_channel <enable> <midi_channel>
-        * set the MIDI channel which changes pedalboard banks on MIDI program change. <midi_channel> is in the range of [0,15].
-        e.g.: set_midi_program_change_pedalboard_bank_channel 1 5 to enable listening for bank changes on channel 6
-
-    set_midi_program_change_pedalboard_snapshot_channel <enable> <midi_channel>
-        * set the MIDI channel which changes pedalboard snapshots on MIDI program change. <midi_channel> is in the range of [0,15].
-        e.g.: set_midi_program_change_pedalboard_snapshot_channel 1 4 to enable listening for preset changes on channel 5
-
     cc_map <instance_number> <param_symbol> <device_id> <actuator_id> <label> <value> <minimum> <maximum> <steps> <extraflags> <unit> <scalepoints_count> <scalepoints...>
         * map a Control Chain actuator to a control port
         e.g.: cc_map 0 "gain" 0 1 "Gain" 0.0 -24.0 3.0 33 0 "dB" 0

src/effects.c

@@ -279,6 +279,7 @@ enum PostPonedEventType {
     POSTPONED_PARAM_SET,
     POSTPONED_AUDIO_MONITOR,
     POSTPONED_OUTPUT_MONITOR,
+    POSTPONED_MIDI_CONTROL_CHANGE,
     POSTPONED_MIDI_PROGRAM_CHANGE,
     POSTPONED_MIDI_MAP,
     POSTPONED_TRANSPORT,
@@ -601,6 +602,12 @@ typedef struct POSTPONED_AUDIO_MONITOR_EVENT_T {
     float value;
 } postponed_audio_monitor_event_t;
 
+typedef struct POSTPONED_MIDI_CONTROL_CHANGE_EVENT_T {
+    int8_t channel;
+    int8_t control;
+    int16_t value;
+} postponed_midi_control_change_event_t;
+
 typedef struct POSTPONED_MIDI_PROGRAM_CHANGE_EVENT_T {
     int8_t program;
     int8_t channel;
@@ -644,6 +651,7 @@ typedef struct POSTPONED_EVENT_T {
     union {
         postponed_parameter_event_t parameter;
         postponed_audio_monitor_event_t audio_monitor;
+        postponed_midi_control_change_event_t control_change;
         postponed_midi_program_change_event_t program_change;
         postponed_midi_map_event_t midi_map;
         postponed_transport_event_t transport;
@@ -804,7 +812,8 @@ static LV2_Feature g_urid_unmap_feature = { LV2_URID__unmap, &g_urid_unmap };
 /* MIDI Learn */
 static pthread_mutex_t g_midi_learning_mutex;
 
-/* MIDI program monitoring */
+/* MIDI control and program monitoring */
+static bool g_monitored_midi_controls[16];
 static bool g_monitored_midi_programs[16];
 
 #ifdef HAVE_HYLIA
@@ -1371,6 +1380,16 @@ static void RunPostPonedEvents(int ignored_effect_id)
             socket_send_feedback_debug(buf);
             break;
 
+        case POSTPONED_MIDI_CONTROL_CHANGE:
+            // TODO skip event if it matches previous one
+
+            snprintf(buf, FEEDBACK_BUF_SIZE, "midi_control_change %i %i %i",
+                     eventptr->event.control_change.channel,
+                     eventptr->event.control_change.control,
+                     eventptr->event.control_change.value);
+            socket_send_feedback_debug(buf);
+            break;
+
         case POSTPONED_MIDI_PROGRAM_CHANGE:
             if (got_midi_program)
             {
@@ -2586,7 +2605,7 @@ static int ProcessGlobalClient(jack_nframes_t nframes, void *arg)
 {
     jack_midi_event_t event;
     uint8_t channel, controller;
-    uint8_t status_nibble, channel_nibble;
+    uint8_t status_nibble;
     uint16_t mvalue;
     float value;
     double dvalue;
@@ -2694,9 +2713,9 @@ static int ProcessGlobalClient(jack_nframes_t nframes, void *arg)
         // Handle MIDI program change
         if (status_nibble == 0xC0)
         {
-            channel_nibble = (event.buffer[0] & 0x0F);
+            channel = (event.buffer[0] & 0x0F);
 
-            if (g_monitored_midi_programs[channel_nibble] && event.size == 2)
+            if (g_monitored_midi_programs[channel] && event.size == 2)
             {
                 // Append to the queue
                 postponed_event_list_data* const posteventptr = rtsafe_memory_pool_allocate_atomic(g_rtsafe_mem_pool);
@@ -2705,7 +2724,7 @@ static int ProcessGlobalClient(jack_nframes_t nframes, void *arg)
                   {
                       posteventptr->event.type = POSTPONED_MIDI_PROGRAM_CHANGE;
                       posteventptr->event.program_change.program = event.buffer[1];
-                      posteventptr->event.program_change.channel = channel_nibble;
+                      posteventptr->event.program_change.channel = channel;
 
                       pthread_mutex_lock(&g_rtsafe_mutex);
                       list_add_tail(&posteventptr->siblings, &g_rtsafe_list);
@@ -2822,6 +2841,24 @@ static int ProcessGlobalClient(jack_nframes_t nframes, void *arg)
                     list_add_tail(&posteventptr->siblings, &g_rtsafe_list);
                     pthread_mutex_unlock(&g_rtsafe_mutex);
 
+                    needs_post = true;
+                }
+            }
+            else if (g_monitored_midi_programs[channel])
+            {
+                postponed_event_list_data* const posteventptr = rtsafe_memory_pool_allocate_atomic(g_rtsafe_mem_pool);
+
+                if (posteventptr)
+                {
+                    posteventptr->event.type = POSTPONED_MIDI_MAP;
+                    posteventptr->event.control_change.channel = channel;
+                    posteventptr->event.control_change.control = controller;
+                    posteventptr->event.control_change.value = mvalue;
+
+                    pthread_mutex_lock(&g_rtsafe_mutex);
+                    list_add_tail(&posteventptr->siblings, &g_rtsafe_list);
+                    pthread_mutex_unlock(&g_rtsafe_mutex);
+
                     needs_post = true;
                 }
             }
@@ -4505,6 +4542,7 @@ int effects_init(void* client)
     }
     g_midi_learning = NULL;
 
+    memset(g_monitored_midi_controls, 0, sizeof(g_monitored_midi_controls));
     memset(g_monitored_midi_programs, 0, sizeof(g_monitored_midi_programs));
 
 #ifdef HAVE_CONTROLCHAIN
@@ -8595,6 +8633,15 @@ int effects_monitor_audio_levels(const char *source_port_name, int enable)
     return SUCCESS;
 }
 
+int effects_monitor_midi_control(int channel, int enable)
+{
+    if (channel < 0 || channel > 15)
+        return ERR_INVALID_OPERATION;
+
+    g_monitored_midi_controls[channel] = enable != 0;
+    return SUCCESS;
+}
+
 int effects_monitor_midi_program(int channel, int enable)
 {
     if (channel < 0 || channel > 15)

src/effects.h

@@ -192,6 +192,7 @@ int effects_cpu_load_enable(int enable);
 int effects_freewheeling_enable(int enable);
 int effects_processing_enable(int enable);
 int effects_monitor_audio_levels(const char *source_port_name, int enable);
+int effects_monitor_midi_control(int channel, int enable);
 int effects_monitor_midi_program(int channel, int enable);
 void effects_transport(int rolling, double beats_per_bar, double beats_per_minute);
 int effects_transport_sync_mode(const char *mode);

src/mod-host.c

@@ -366,6 +366,13 @@ static void monitor_audio_levels_cb(proto_t *proto)
     protocol_response_int(resp, proto);
 }
 
+static void monitor_midi_control_cb(proto_t *proto)
+{
+    int resp;
+    resp = effects_monitor_midi_control(atoi(proto->list[1]), atoi(proto->list[2]));
+    protocol_response_int(resp, proto);
+}
+
 static void monitor_midi_program_cb(proto_t *proto)
 {
     int resp;
@@ -777,6 +784,7 @@ static int mod_host_init(jack_client_t* client, int socket_port, int feedback_po
     protocol_add_command(MONITOR_OUTPUT, monitor_output_cb);
     protocol_add_command(MONITOR_OUTPUT_OFF, monitor_output_off_cb);
     protocol_add_command(MONITOR_AUDIO_LEVELS, monitor_audio_levels_cb);
+    protocol_add_command(MONITOR_MIDI_CONTROL, monitor_midi_control_cb);
     protocol_add_command(MONITOR_MIDI_PROGRAM, monitor_midi_program_cb);
     protocol_add_command(MIDI_LEARN, midi_learn_cb);
     protocol_add_command(MIDI_MAP, midi_map_cb);

src/mod-host.h

@@ -75,6 +75,7 @@
 #define MONITOR_OUTPUT       "monitor_output %i %s"
 #define MONITOR_OUTPUT_OFF   "monitor_output_off %i %s"
 #define MONITOR_AUDIO_LEVELS "monitor_audio_levels %i %s"
+#define MONITOR_MIDI_CONTROL "monitor_midi_control %i %i"
 #define MONITOR_MIDI_PROGRAM "monitor_midi_program %i %i"
 #define MIDI_LEARN           "midi_learn %i %s %f %f"
 #define MIDI_MAP             "midi_map %i %s %i %i %f %f"