boomjacky/looper
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix: add null-checks for MIDI ports and use atomic access for channel active flag

Browse Source 
Co-authored-by: aider (deepseek/deepseek-reasoner) <aider@aider.chat>
This commit is contained in:
Loic Coenen
2026-05-09 09:57:36 +00:00
parent 74a190c70c
commit c0a0a6e968
4 changed files with 36 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/channel.c
View File

@@ -23,7 +23,7 @@ void channel_add(jack_client_t *client, int idx)
return; return;
} }
channels[idx].active = 1; atomic_store(&channels[idx].active, 1);
atomic_store(&channels[idx].state, STATE_IDLE); atomic_store(&channels[idx].state, STATE_IDLE);
channels[idx].prev_state = -1; channels[idx].prev_state = -1;
channels[idx].loop_count = 0; channels[idx].loop_count = 0;
@@ -38,6 +38,6 @@ void channel_remove(jack_client_t *client, int idx)
{ {
jack_port_unregister(client, channels[idx].audio_in); jack_port_unregister(client, channels[idx].audio_in);
jack_port_unregister(client, channels[idx].audio_out); jack_port_unregister(client, channels[idx].audio_out);
channels[idx].active = 0; atomic_store(&channels[idx].active, 0);
channel_count--; channel_count--;
} }

2
src/channel.h
View File

@@ -21,7 +21,7 @@ struct channel_t {
int loop_count; int loop_count;
int record_pos; int record_pos;
int playback_pos; int playback_pos;
int active; atomic_int active;
jack_port_t *audio_in; jack_port_t *audio_in;
jack_port_t *audio_out; jack_port_t *audio_out;
}; };

60
src/looper.c
View File

@@ -26,14 +26,16 @@ int process_callback(jack_nframes_t nframes, void *arg)
{ {
(void)arg; (void)arg;
void *midi_ctrl_buf = jack_port_get_buffer(midi_control_port, nframes); if (midi_control_port) {
if (midi_ctrl_buf) { void *midi_ctrl_buf = jack_port_get_buffer(midi_control_port, nframes);
midi_handle_events(midi_ctrl_buf, nframes); if (midi_ctrl_buf) {
midi_handle_events(midi_ctrl_buf, nframes);
}
} }
/* process each active channel */ /* process each active channel */
for (int c = 0; c < MAX_CHANNELS; c++) { for (int c = 0; c < MAX_CHANNELS; c++) {
if (!channels[c].active) continue; if (!atomic_load(&channels[c].active)) continue;
/* Guard against NULL ports (e.g. if port registration failed) */ /* Guard against NULL ports (e.g. if port registration failed) */
if (!channels[c].audio_in || !channels[c].audio_out) { if (!channels[c].audio_in || !channels[c].audio_out) {
@@ -108,30 +110,32 @@ int process_callback(jack_nframes_t nframes, void *arg)
} }
/* MIDI clock events – affect channel 0 only */ /* MIDI clock events – affect channel 0 only */
void *midi_clock_buf = jack_port_get_buffer(midi_clock_port, nframes); if (midi_clock_port) {
if (midi_clock_buf) { void *midi_clock_buf = jack_port_get_buffer(midi_clock_port, nframes);
jack_nframes_t n_clock_events = jack_midi_get_event_count(midi_clock_buf); if (midi_clock_buf) {
jack_midi_event_t cev; jack_nframes_t n_clock_events = jack_midi_get_event_count(midi_clock_buf);
for (jack_nframes_t j = 0; j < n_clock_events; j++) { jack_midi_event_t cev;
if (jack_midi_event_get(&cev, midi_clock_buf, j) != 0) continue; for (jack_nframes_t j = 0; j < n_clock_events; j++) {
if (cev.size >= 1) { if (jack_midi_event_get(&cev, midi_clock_buf, j) != 0) continue;
unsigned char msg = cev.buffer[0]; if (cev.size >= 1) {
switch (msg) { unsigned char msg = cev.buffer[0];
case 0xFA: { switch (msg) {
int s = atomic_load(&channels[0].state); case 0xFA: {
if (s == STATE_IDLE) atomic_store(&channels[0].state, STATE_RECORD); int s = atomic_load(&channels[0].state);
break; if (s == STATE_IDLE) atomic_store(&channels[0].state, STATE_RECORD);
} break;
case 0xFC: }
atomic_store(&channels[0].state, STATE_IDLE); case 0xFC:
break; atomic_store(&channels[0].state, STATE_IDLE);
case 0xFB: { break;
int s = atomic_load(&channels[0].state); case 0xFB: {
if (s == STATE_PAUSED) atomic_store(&channels[0].state, STATE_LOOPING); int s = atomic_load(&channels[0].state);
break; if (s == STATE_PAUSED) atomic_store(&channels[0].state, STATE_LOOPING);
} break;
default: }
break; default:
break;
}
} }
} }
} }

1
tests/integration.c
View File

@@ -34,6 +34,7 @@ static unsigned char midi_inject_velocity = 0;
static int midi_inject_process(jack_nframes_t nframes, void *arg) { static int midi_inject_process(jack_nframes_t nframes, void *arg) {
(void)arg; (void)arg;
if (!midi_inject_port) return 0;
void *port_buf = jack_port_get_buffer(midi_inject_port, nframes); void *port_buf = jack_port_get_buffer(midi_inject_port, nframes);
if (!port_buf) return 0; if (!port_buf) return 0;
jack_midi_clear_buffer(port_buf); jack_midi_clear_buffer(port_buf);