fix: add null-checks for MIDI ports and use atomic access for channel active flag
Co-authored-by: aider (deepseek/deepseek-reasoner) <aider@aider.chat>
This commit is contained in:
60
src/looper.c
60
src/looper.c
@@ -26,14 +26,16 @@ int process_callback(jack_nframes_t nframes, void *arg)
|
||||
{
|
||||
(void)arg;
|
||||
|
||||
void *midi_ctrl_buf = jack_port_get_buffer(midi_control_port, nframes);
|
||||
if (midi_ctrl_buf) {
|
||||
midi_handle_events(midi_ctrl_buf, nframes);
|
||||
if (midi_control_port) {
|
||||
void *midi_ctrl_buf = jack_port_get_buffer(midi_control_port, nframes);
|
||||
if (midi_ctrl_buf) {
|
||||
midi_handle_events(midi_ctrl_buf, nframes);
|
||||
}
|
||||
}
|
||||
|
||||
/* process each active channel */
|
||||
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) */
|
||||
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 */
|
||||
void *midi_clock_buf = jack_port_get_buffer(midi_clock_port, nframes);
|
||||
if (midi_clock_buf) {
|
||||
jack_nframes_t n_clock_events = jack_midi_get_event_count(midi_clock_buf);
|
||||
jack_midi_event_t cev;
|
||||
for (jack_nframes_t j = 0; j < n_clock_events; j++) {
|
||||
if (jack_midi_event_get(&cev, midi_clock_buf, j) != 0) continue;
|
||||
if (cev.size >= 1) {
|
||||
unsigned char msg = cev.buffer[0];
|
||||
switch (msg) {
|
||||
case 0xFA: {
|
||||
int s = atomic_load(&channels[0].state);
|
||||
if (s == STATE_IDLE) atomic_store(&channels[0].state, STATE_RECORD);
|
||||
break;
|
||||
}
|
||||
case 0xFC:
|
||||
atomic_store(&channels[0].state, STATE_IDLE);
|
||||
break;
|
||||
case 0xFB: {
|
||||
int s = atomic_load(&channels[0].state);
|
||||
if (s == STATE_PAUSED) atomic_store(&channels[0].state, STATE_LOOPING);
|
||||
break;
|
||||
}
|
||||
default:
|
||||
break;
|
||||
if (midi_clock_port) {
|
||||
void *midi_clock_buf = jack_port_get_buffer(midi_clock_port, nframes);
|
||||
if (midi_clock_buf) {
|
||||
jack_nframes_t n_clock_events = jack_midi_get_event_count(midi_clock_buf);
|
||||
jack_midi_event_t cev;
|
||||
for (jack_nframes_t j = 0; j < n_clock_events; j++) {
|
||||
if (jack_midi_event_get(&cev, midi_clock_buf, j) != 0) continue;
|
||||
if (cev.size >= 1) {
|
||||
unsigned char msg = cev.buffer[0];
|
||||
switch (msg) {
|
||||
case 0xFA: {
|
||||
int s = atomic_load(&channels[0].state);
|
||||
if (s == STATE_IDLE) atomic_store(&channels[0].state, STATE_RECORD);
|
||||
break;
|
||||
}
|
||||
case 0xFC:
|
||||
atomic_store(&channels[0].state, STATE_IDLE);
|
||||
break;
|
||||
case 0xFB: {
|
||||
int s = atomic_load(&channels[0].state);
|
||||
if (s == STATE_PAUSED) atomic_store(&channels[0].state, STATE_LOOPING);
|
||||
break;
|
||||
}
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user