Merge pull request '1-multichannel' (#1) from 1-multichannel into multichannel

Reviewed-on: #1

.githooks/pre-push

@@ -0,0 +1,4 @@
+#!/bin/bash
+make test
+make check
+make format

makefile

@@ -22,8 +22,11 @@ clean:
 	rm -f looper integration_test src/*.o
 
 check:
-	cppcheck --enable=all --error-exitcode=1 src/*.c
+	cppcheck --enable=all --error-exitcode=1 --suppress=missingIncludeSystem --suppress=normalCheckLevelMaxBranches src/*.c --library=posix .
 
 # Optional: Format code using clang-format
 format:
 	clang-format -i src/*.c
+
+install-hooks:
+	git config core.hooksPath .githooks

src/channel.c

@@ -1,23 +1,22 @@
-#include <stdio.h>
-#include <string.h>
+// cppcheck-suppress missingIncludeSystem
+#include "channel.h"
 #include <jack/jack.h>
 #include <stdatomic.h>
-#include "channel.h"
+#include <stdio.h>
+#include <string.h>
 
-void channel_add(jack_client_t *client, int idx)
-{
+void channel_add(jack_client_t *client, int idx) {
   char in_name[64], out_name[64];
   snprintf(in_name, sizeof(in_name), "channel%d_input", next_channel_id);
   snprintf(out_name, sizeof(out_name), "channel%d_output", next_channel_id);
 
-    channels[idx].audio_in = jack_port_register(client, in_name,
-                                                JACK_DEFAULT_AUDIO_TYPE,
-                                                JackPortIsInput, 0);
-    channels[idx].audio_out = jack_port_register(client, out_name,
-                                                 JACK_DEFAULT_AUDIO_TYPE,
-                                                 JackPortIsOutput, 0);
+  channels[idx].audio_in = jack_port_register(
+      client, in_name, JACK_DEFAULT_AUDIO_TYPE, JackPortIsInput, 0);
+  channels[idx].audio_out = jack_port_register(
+      client, out_name, JACK_DEFAULT_AUDIO_TYPE, JackPortIsOutput, 0);
   if (!channels[idx].audio_in || !channels[idx].audio_out) {
-        fprintf(stderr, "Failed to register ports for channel %d\n", next_channel_id);
+    fprintf(stderr, "Failed to register ports for channel %d\n",
+            next_channel_id);
     /* Do NOT mark channel active – process loop will skip it */
     atomic_store(&channels[idx].active, 0);
     return;
@@ -34,8 +33,7 @@ void channel_add(jack_client_t *client, int idx)
   channel_count++;
 }
 
-void channel_remove(jack_client_t *client, int idx)
-{
+void channel_remove(jack_client_t *client, int idx) {
   (void)client;
   atomic_store(&channels[idx].active, 0);
   channel_count--;

src/channel.h

@@ -1,6 +1,7 @@
 #ifndef CHANNEL_H
 #define CHANNEL_H
 
+// cppcheck-suppress missingIncludeSystem
 #include <jack/jack.h>
 #include <stdatomic.h>
 

src/looper.c

@@ -1,13 +1,14 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <jack/jack.h>
-#include <jack/midiport.h>
-#include <stdatomic.h>
-#include <math.h>
+// cppcheck-suppress missingIncludeSystem
 #include "looper.h"
 #include "channel.h"
 #include "midi.h"
+#include <jack/jack.h>
+#include <jack/midiport.h>
+#include <math.h>
+#include <stdatomic.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 /* Global state (shared across files) */
 struct channel_t channels[MAX_CHANNELS];
@@ -26,8 +27,7 @@ static int pending_unregister_idx = -1;
 /* ----------------------------------------------------------------
  * process callback
  * ---------------------------------------------------------------- */
-int process_callback(jack_nframes_t nframes, void *arg)
-{
+int process_callback(jack_nframes_t nframes, void *arg) {
   (void)arg;
 
   if (midi_control_port) {
@@ -39,7 +39,8 @@ int process_callback(jack_nframes_t nframes, void *arg)
 
   /* process each active channel */
   for (int c = 0; c < MAX_CHANNELS; c++) {
-        if (!atomic_load(&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) {
@@ -47,11 +48,14 @@ int process_callback(jack_nframes_t nframes, void *arg)
       continue;
     }
 
-        jack_default_audio_sample_t *in  = (jack_default_audio_sample_t *)
-            jack_port_get_buffer(channels[c].audio_in, nframes);
-        jack_default_audio_sample_t *out = (jack_default_audio_sample_t *)
-            jack_port_get_buffer(channels[c].audio_out, nframes);
-        if (!out) continue;
+    const jack_default_audio_sample_t *in =
+        (const jack_default_audio_sample_t *)jack_port_get_buffer(
+            channels[c].audio_in, nframes);
+    jack_default_audio_sample_t *out =
+        (jack_default_audio_sample_t *)jack_port_get_buffer(
+            channels[c].audio_out, nframes);
+    if (!out)
+      continue;
 
     int state = atomic_load(&channels[c].state);
 
@@ -75,10 +79,13 @@ int process_callback(jack_nframes_t nframes, void *arg)
     switch (state) {
     case STATE_RECORD:
       if (in) {
+        float *f_out = (float *)out;
+        const float *f_in = (const float *)in;
         for (i = 0; i < nframes; i++) {
           if (channels[c].record_pos < LOOP_BUF_SIZE)
-                        channels[c].loop_buffer[channels[c].record_pos++] = ((const float *)in)[i];
-                    ((float *)out)[i] = ((const float *)in)[i];
+            channels[c].loop_buffer[channels[c].record_pos++] =
+                f_in[i];
+          f_out[i] = f_in[i];
         }
       } else {
         memset(out, 0, sizeof(jack_default_audio_sample_t) * nframes);
@@ -90,7 +97,8 @@ int process_callback(jack_nframes_t nframes, void *arg)
         float *outf = (float *)out;
         for (i = 0; i < nframes; i++) {
           outf[i] = channels[c].loop_buffer[channels[c].playback_pos];
-                    channels[c].playback_pos = (channels[c].playback_pos + 1) % channels[c].loop_count;
+          channels[c].playback_pos =
+              (channels[c].playback_pos + 1) % channels[c].loop_count;
         }
       } else {
         memset(out, 0, sizeof(jack_default_audio_sample_t) * nframes);
@@ -120,13 +128,15 @@ int process_callback(jack_nframes_t nframes, void *arg)
       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 (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);
+            if (s == STATE_IDLE)
+              atomic_store(&channels[0].state, STATE_RECORD);
             break;
           }
           case 0xFC:
@@ -134,7 +144,8 @@ int process_callback(jack_nframes_t nframes, void *arg)
             break;
           case 0xFB: {
             int s = atomic_load(&channels[0].state);
-                        if (s == STATE_PAUSED) atomic_store(&channels[0].state, STATE_LOOPING);
+            if (s == STATE_PAUSED)
+              atomic_store(&channels[0].state, STATE_LOOPING);
             break;
           }
           default:
@@ -151,8 +162,7 @@ int process_callback(jack_nframes_t nframes, void *arg)
 /* ----------------------------------------------------------------
  * shutdown callback
  * ---------------------------------------------------------------- */
-void jack_shutdown_cb(void *arg)
-{
+void jack_shutdown_cb(void *arg) {
   (void)arg;
   fprintf(stderr, "JACK shutdown\n");
   exit(0);
@@ -161,8 +171,7 @@ void jack_shutdown_cb(void *arg)
 /* ----------------------------------------------------------------
  * looper initialisation
  * ---------------------------------------------------------------- */
-int looper_init(jack_client_t *client)
-{
+int looper_init(jack_client_t *client) {
   /* channel 0 */
   channels[0].active = 1;
   atomic_store(&channels[0].state, STATE_IDLE);
@@ -171,23 +180,19 @@ int looper_init(jack_client_t *client)
   channels[0].record_pos = 0;
   channels[0].playback_pos = 0;
 
-    channels[0].audio_in = jack_port_register(client, "input",
-                                               JACK_DEFAULT_AUDIO_TYPE,
-                                               JackPortIsInput, 0);
-    channels[0].audio_out = jack_port_register(client, "output",
-                                                JACK_DEFAULT_AUDIO_TYPE,
-                                                JackPortIsOutput, 0);
+  channels[0].audio_in = jack_port_register(
+      client, "input", JACK_DEFAULT_AUDIO_TYPE, JackPortIsInput, 0);
+  channels[0].audio_out = jack_port_register(
+      client, "output", JACK_DEFAULT_AUDIO_TYPE, JackPortIsOutput, 0);
   if (!channels[0].audio_in || !channels[0].audio_out) {
     fprintf(stderr, "Could not create audio ports for channel 0\n");
     return -1;
   }
   channel_count = 1;
 
-    midi_control_port = jack_port_register(client, "control",
-                                            JACK_DEFAULT_MIDI_TYPE,
-                                            JackPortIsInput, 0);
-    midi_clock_port   = jack_port_register(client, "clock",
-                                            JACK_DEFAULT_MIDI_TYPE,
+  midi_control_port = jack_port_register(
+      client, "control", JACK_DEFAULT_MIDI_TYPE, JackPortIsInput, 0);
+  midi_clock_port = jack_port_register(client, "clock", JACK_DEFAULT_MIDI_TYPE,
                                        JackPortIsInput, 0);
   if (!midi_control_port || !midi_clock_port) {
     fprintf(stderr, "Could not create MIDI ports\n");
@@ -200,8 +205,7 @@ int looper_init(jack_client_t *client)
 /* ----------------------------------------------------------------
  * main‑loop command processing
  * ---------------------------------------------------------------- */
-void looper_process_commands(jack_client_t *client)
-{
+void looper_process_commands(jack_client_t *client) {
   /* Unregister any ports that were marked for deferred removal.
      By now the real‑time thread has had at least one full cycle
      to see the `active = 0` store. */
@@ -217,7 +221,8 @@ void looper_process_commands(jack_client_t *client)
   if (atomic_exchange(&cmd_add, 0)) {
     int idx;
     for (idx = 0; idx < MAX_CHANNELS; idx++)
-            if (!channels[idx].active) break;
+      if (!channels[idx].active)
+        break;
     if (idx < MAX_CHANNELS) {
       channel_add(client, idx);
     }
@@ -226,7 +231,8 @@ void looper_process_commands(jack_client_t *client)
   if (atomic_exchange(&cmd_remove, 0)) {
     int remove_idx = -1;
     for (int idx = 1; idx < MAX_CHANNELS; idx++)
-            if (channels[idx].active) remove_idx = idx;
+      if (channels[idx].active)
+        remove_idx = idx;
     if (remove_idx != -1) {
       /* Mark inactive now; ports will be unregistered next round */
       channel_remove(client, remove_idx);

src/looper.h

@@ -1,6 +1,7 @@
 #ifndef LOOPER_H
 #define LOOPER_H
 
+// cppcheck-suppress missingIncludeSystem
 #include <jack/jack.h>
 
 /* Initialisation – must be called after setting process callback */

src/main.c

@@ -1,11 +1,12 @@
+// cppcheck-suppress missingIncludeSystem
+#include "looper.h"
+#include <jack/jack.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <jack/jack.h>
-#include "looper.h"
+#include <time.h>
 
-int main(int argc, char *argv[])
-{
+int main(int argc, char *argv[]) {
   (void)argc;
   (void)argv;
   const char *client_name = "looper";
@@ -42,7 +43,7 @@ int main(int argc, char *argv[])
 
   while (1) {
     looper_process_commands(client);
-        usleep(50000);   /* check commands every 50 ms */
+    { struct timespec ts = { .tv_sec = 0, .tv_nsec = 50000000 }; nanosleep(&ts, NULL); } /* check commands every 50 ms */
   }
 
   jack_client_close(client);

src/midi.c

@@ -1,23 +1,25 @@
+// cppcheck-suppress missingIncludeSystem
+#include "midi.h"
+#include "channel.h"
 #include <jack/jack.h>
 #include <jack/midiport.h>
 #include <stdatomic.h>
-#include "midi.h"
-#include "channel.h"
 
 extern atomic_int control_key_active;
 extern atomic_int cmd_add;
 extern atomic_int cmd_remove;
 extern atomic_int bind_channel;
 
-void midi_handle_events(void *port_buffer, jack_nframes_t nframes)
-{
+void midi_handle_events(void *port_buffer, jack_nframes_t nframes) {
   (void)nframes;
   jack_nframes_t nevents = jack_midi_get_event_count(port_buffer);
   jack_midi_event_t ev;
 
   for (jack_nframes_t i = 0; i < nevents; i++) {
-        if (jack_midi_event_get(&ev, port_buffer, i) != 0) continue;
-        if (ev.size < 3) continue;
+    if (jack_midi_event_get(&ev, port_buffer, i) != 0)
+      continue;
+    if (ev.size < 3)
+      continue;
 
     unsigned char status = ev.buffer[0];
     unsigned char note = ev.buffer[1];
@@ -35,8 +37,12 @@ void midi_handle_events(void *port_buffer, jack_nframes_t nframes)
             atomic_store(&bind_channel, note);
           } else {
             switch (note) {
-                        case 60: atomic_store(&cmd_add, 1); break;
-                        case 61: atomic_store(&cmd_remove, 1); break;
+            case 60:
+              atomic_store(&cmd_add, 1);
+              break;
+            case 61:
+              atomic_store(&cmd_remove, 1);
+              break;
             case 62: /* trigger looper – channel via bind_channel */
             {
               int bch = atomic_load(&bind_channel);
@@ -57,8 +63,7 @@ void midi_handle_events(void *port_buffer, jack_nframes_t nframes)
                   break;
                 }
               }
-                            }
-                            break;
+            } break;
             case 63: /* unbind – reset bind to channel 0 */
               atomic_store(&bind_channel, 0);
               break;
@@ -86,16 +91,20 @@ void midi_handle_events(void *port_buffer, jack_nframes_t nframes)
               atomic_store(&channels[0].state, STATE_LOOPING);
               break;
             }
-                        }
+          } break;
+          case 60:
+            atomic_store(&cmd_add, 1);
+            break;
+          case 61:
+            atomic_store(&cmd_remove, 1);
             break;
-                    case 60: atomic_store(&cmd_add, 1); break;
-                    case 61: atomic_store(&cmd_remove, 1); break;
           default:
             break;
           }
         }
       }
-        } else if ((status & 0xf0) == 0x80 || ((status & 0xf0) == 0x90 && vel == 0)) {
+    } else if ((status & 0xf0) == 0x80 ||
+               ((status & 0xf0) == 0x90 && vel == 0)) {
       atomic_store(&control_key_active, 0);
     }
   }

src/midi.h

@@ -1,6 +1,7 @@
 #ifndef MIDI_H
 #define MIDI_H
 
+// cppcheck-suppress missingIncludeSystem
 #include <jack/types.h>
 
 void midi_handle_events(void *port_buffer, jack_nframes_t nframes);

tests/integration.c

@@ -10,6 +10,7 @@
 #include <jack/jack.h>
 #include <jack/midiport.h>
 #include <math.h>
+#include <time.h>
 
 /* static variables for passthrough test */
 static jack_port_t *passthrough_output_port = NULL;
@@ -32,6 +33,13 @@ static jack_client_t *midi_inject_client = NULL;
 static unsigned char midi_inject_note = 0;
 static unsigned char midi_inject_velocity = 0;
 
+static void safe_usleep(unsigned int usec) {
+    struct timespec ts;
+    ts.tv_sec = usec / 1000000;
+    ts.tv_nsec = (usec % 1000000) * 1000L;
+    nanosleep(&ts, NULL);
+}
+
 static int midi_inject_process(jack_nframes_t nframes, void *arg) {
     (void)arg;
     if (!midi_inject_port) return 0;
@@ -57,11 +65,11 @@ static int passthrough_process(jack_nframes_t nframes, void *arg) {
     (void)arg;
     jack_default_audio_sample_t *out =
         (jack_default_audio_sample_t *)jack_port_get_buffer(passthrough_output_port, nframes);
-    jack_default_audio_sample_t *in =
-        (jack_default_audio_sample_t *)jack_port_get_buffer(passthrough_input_port, nframes);
+    const jack_default_audio_sample_t *in =
+        (const jack_default_audio_sample_t *)jack_port_get_buffer(passthrough_input_port, nframes);
     if (!out || !in) return 0;
-    float *outf = out;
-    const float *inf = in;
+    float *f_out = (float *)out;
+    const float *f_in = (const float *)in;
     for (jack_nframes_t i = 0; i < nframes; i++) {
         /* generate beep while beep_remaining > 0 or continuous sine */
         float out_val;
@@ -74,17 +82,17 @@ static int passthrough_process(jack_nframes_t nframes, void *arg) {
         } else {
             out_val = 0.0f;
         }
-        outf[i] = out_val;
+        f_out[i] = out_val;
 
         /* detect bursts on the input (looper output) */
-        float sample = inf[i];
+        float sample = f_in[i];
         int above = (fabsf(sample) > 0.05f);
         if (above && !prev_above) {
             bursts++;
         }
         prev_above = above;
 
-        passthrough_sum_sq += (double)inf[i] * (double)inf[i];
+        passthrough_sum_sq += (double)f_in[i] * (double)f_in[i];
         passthrough_total_samples++;
     }
     if (passthrough_total_samples >= passthrough_sample_rate * 2) {
@@ -157,7 +165,7 @@ static int test_audio_pass_through(void) {
         waitpid(pid, NULL, 0);
         return 1;
     }
-    usleep(200000);
+    safe_usleep(200000);
     const char *looper_input = "looper:input";
     const char *looper_output = "looper:output";
     char my_output[64], my_input[64];
@@ -195,7 +203,7 @@ static int test_audio_pass_through(void) {
         waitpid(pid, NULL, 0);
         return 1;
     }
-    usleep(2200000); /* 2.2 seconds */
+    safe_usleep(2200000);
     int saw_input = passthrough_done;
     double rms = passthrough_total_samples > 0 ?
                  sqrt(passthrough_sum_sq / passthrough_total_samples) : 0.0;
@@ -251,7 +259,7 @@ static int send_jack_note_on(const char *target_port, unsigned char note, unsign
     }
     /* wait for the process callback to clear the flag (event delivered) */
     for (int attempts = 0; attempts < 50; attempts++) {   /* ~50 * 10ms = 500ms */
-        usleep(10000);
+        safe_usleep(10000);
         if (!midi_inject_pending) break;
     }
     jack_deactivate(midi_inject_client);
@@ -295,7 +303,7 @@ static int test_looper_looping(void) {
         kill(pid, SIGTERM); waitpid(pid, NULL, 0);
         return 1;
     }
-    usleep(200000);               /* wait for ports to appear */
+    safe_usleep(200000);               /* wait for ports to appear */
     /* connect test:out -> looper:input, looper:output -> test:in */
     char my_out[64], my_in[64];
     snprintf(my_out, sizeof(my_out), "test_looping:out");
@@ -313,7 +321,7 @@ static int test_looper_looping(void) {
         kill(pid, SIGTERM); waitpid(pid, NULL, 0);
         return 1;
     }
-    usleep(500000);               /* allow state to change (500ms) */
+    safe_usleep(500000);               /* allow state to change (500ms) */
 
     int sr = jack_get_sample_rate(client);
     continuous_sine = 0;          /* disable continuous tone */
@@ -337,10 +345,10 @@ static int test_looper_looping(void) {
         return 1;
     }
 
-    usleep(150000);               /* let beep start */
+    safe_usleep(150000);               /* let beep start */
 
     /* ensure beep is fully captured */
-    usleep(800000);   /* 0.8s after start of beep */
+    safe_usleep(800000);   /* 0.8s after start of beep */
 
     if (send_jack_note_on("looper:control", 1, 127) != 0) {
         jack_client_close(client);
@@ -349,7 +357,7 @@ static int test_looper_looping(void) {
     }
 
     /* wait enough time for several loops (4 seconds to be safe) */
-    usleep(4000000);
+    safe_usleep(4000000);
 
     jack_deactivate(client);
     jack_client_close(client);
@@ -390,7 +398,7 @@ static int test_multiple_channels(void) {
     }
     /* wait long enough for the looper's main loop to process the add command
        (it sleeps for 1 second between checks, so 1.5 s is safe) */
-    usleep(1500000);
+    safe_usleep(1500000);
 
     int found = 0;
     const char **ports = jack_get_ports(client, NULL, JACK_DEFAULT_AUDIO_TYPE, 0);
@@ -440,7 +448,7 @@ static int test_control_key_modifier(void) {
         kill(pid, SIGTERM); waitpid(pid, NULL, 0);
         return 1;
     }
-    usleep(200000);
+    safe_usleep(200000);
     char my_out[64], my_in[64];
     snprintf(my_out, sizeof(my_out), "test_ctrl_key:out");
     snprintf(my_in,  sizeof(my_in),  "test_ctrl_key:in");
@@ -457,7 +465,7 @@ static int test_control_key_modifier(void) {
         fprintf(stderr, "  FAIL: send note 64 failed\n");
         return 1;
     }
-    usleep(200000);
+    safe_usleep(200000);
     /* Now send note 62 (toggle channel 0) */
     if (send_jack_note_on("looper:control", 62, 127) != 0) {
         jack_client_close(client);
@@ -485,7 +493,7 @@ static int test_control_key_modifier(void) {
         kill(pid, SIGTERM); waitpid(pid, NULL, 0);
         return 1;
     }
-    usleep(200000);   /* allow beep */
+    safe_usleep(200000);   /* allow beep */
     /* send note 62 again under control key to move RECORD->LOOPING */
     if (send_jack_note_on("looper:control", 64, 127) != 0) {
         jack_client_close(client);
@@ -493,14 +501,14 @@ static int test_control_key_modifier(void) {
         fprintf(stderr, "  FAIL: control key re‑send\n");
         return 1;
     }
-    usleep(200000);
+    safe_usleep(200000);
     if (send_jack_note_on("looper:control", 62, 127) != 0) {
         jack_client_close(client);
         kill(pid, SIGTERM); waitpid(pid, NULL, 0);
         fprintf(stderr, "  FAIL: send note 62 for loop\n");
         return 1;
     }
-    usleep(2000000);   /* wait for a few loops */
+    safe_usleep(2000000);
     jack_deactivate(client);
     jack_client_close(client);
     kill(pid, SIGTERM);
@@ -539,7 +547,7 @@ static int test_bind_channel(void) {
         kill(pid, SIGTERM); waitpid(pid, NULL, 0);
         return 1;
     }
-    usleep(200000);
+    safe_usleep(200000);
     char my_out[64], my_in[64];
     snprintf(my_out, sizeof(my_out), "test_bind:out");
     snprintf(my_in,  sizeof(my_in),  "test_bind:in");
@@ -556,14 +564,14 @@ static int test_bind_channel(void) {
         fprintf(stderr, "  FAIL: send control key failed\n");
         return 1;
     }
-    usleep(200000);
+    safe_usleep(200000);
     if (send_jack_note_on("looper:control", 0, 127) != 0) {
         jack_client_close(client);
         kill(pid, SIGTERM); waitpid(pid, NULL, 0);
         fprintf(stderr, "  FAIL: send bind note 0 failed\n");
         return 1;
     }
-    usleep(200000);
+    safe_usleep(200000);
     /* Now toggle using control+note62 – should toggle channel 0 */
     if (send_jack_note_on("looper:control", 64, 127) != 0) {
         jack_client_close(client);
@@ -571,7 +579,7 @@ static int test_bind_channel(void) {
         fprintf(stderr, "  FAIL: send control key again failed\n");
         return 1;
     }
-    usleep(200000);
+    safe_usleep(200000);
     if (send_jack_note_on("looper:control", 62, 127) != 0) {
         jack_client_close(client);
         kill(pid, SIGTERM); waitpid(pid, NULL, 0);
@@ -598,7 +606,7 @@ static int test_bind_channel(void) {
         kill(pid, SIGTERM); waitpid(pid, NULL, 0);
         return 1;
     }
-    usleep(200000); /* allow beep */
+    safe_usleep(200000); /* allow beep */
     /* send control+note62 again to move RECORD->LOOPING */
     if (send_jack_note_on("looper:control", 64, 127) != 0) {
         jack_client_close(client);
@@ -606,14 +614,14 @@ static int test_bind_channel(void) {
         fprintf(stderr, "  FAIL: control key for loop\n");
         return 1;
     }
-    usleep(200000);
+    safe_usleep(200000);
     if (send_jack_note_on("looper:control", 62, 127) != 0) {
         jack_client_close(client);
         kill(pid, SIGTERM); waitpid(pid, NULL, 0);
         fprintf(stderr, "  FAIL: toggle for loop\n");
         return 1;
     }
-    usleep(2000000);
+    safe_usleep(2000000);
     jack_deactivate(client);
     jack_client_close(client);
     kill(pid, SIGTERM);
@@ -652,7 +660,7 @@ static int test_bind_unbind(void) {
         kill(pid, SIGTERM); waitpid(pid, NULL, 0);
         return 1;
     }
-    usleep(200000);
+    safe_usleep(200000);
     char my_out[64], my_in[64];
     snprintf(my_out, sizeof(my_out), "test_unbind:out");
     snprintf(my_in,  sizeof(my_in),  "test_unbind:in");
@@ -669,14 +677,14 @@ static int test_bind_unbind(void) {
         fprintf(stderr, "  FAIL: send control key failed\n");
         return 1;
     }
-    usleep(200000);
+    safe_usleep(200000);
     if (send_jack_note_on("looper:control", 5, 127) != 0) {
         jack_client_close(client);
         kill(pid, SIGTERM); waitpid(pid, NULL, 0);
         fprintf(stderr, "  FAIL: bind to 5 failed\n");
         return 1;
     }
-    usleep(200000);
+    safe_usleep(200000);
     /* Unbind (reset to 0) */
     if (send_jack_note_on("looper:control", 64, 127) != 0) {
         jack_client_close(client);
@@ -684,14 +692,14 @@ static int test_bind_unbind(void) {
         fprintf(stderr, "  FAIL: control key for unbind\n");
         return 1;
     }
-    usleep(200000);
+    safe_usleep(200000);
     if (send_jack_note_on("looper:control", 63, 127) != 0) {
         jack_client_close(client);
         kill(pid, SIGTERM); waitpid(pid, NULL, 0);
         fprintf(stderr, "  FAIL: send unbind note 63 failed\n");
         return 1;
     }
-    usleep(200000);
+    safe_usleep(200000);
     /* Now toggle with control+62 – should affect channel 0 */
     if (send_jack_note_on("looper:control", 64, 127) != 0) {
         jack_client_close(client);
@@ -699,7 +707,7 @@ static int test_bind_unbind(void) {
         fprintf(stderr, "  FAIL: control key for toggle\n");
         return 1;
     }
-    usleep(200000);
+    safe_usleep(200000);
     if (send_jack_note_on("looper:control", 62, 127) != 0) {
         jack_client_close(client);
         kill(pid, SIGTERM); waitpid(pid, NULL, 0);
@@ -726,7 +734,7 @@ static int test_bind_unbind(void) {
         kill(pid, SIGTERM); waitpid(pid, NULL, 0);
         return 1;
     }
-    usleep(200000); /* allow beep */
+    safe_usleep(200000); /* allow beep */
     /* second control+62 -> loop */
     if (send_jack_note_on("looper:control", 64, 127) != 0) {
         jack_client_close(client);
@@ -734,14 +742,14 @@ static int test_bind_unbind(void) {
         fprintf(stderr, "  FAIL: control key for loop\n");
         return 1;
     }
-    usleep(200000);
+    safe_usleep(200000);
     if (send_jack_note_on("looper:control", 62, 127) != 0) {
         jack_client_close(client);
         kill(pid, SIGTERM); waitpid(pid, NULL, 0);
         fprintf(stderr, "  FAIL: toggle for loop\n");
         return 1;
     }
-    usleep(2000000);
+    safe_usleep(2000000);
     jack_deactivate(client);
     jack_client_close(client);
     kill(pid, SIGTERM);
@@ -776,7 +784,7 @@ static int test_remove_channel(void) {
         fprintf(stderr, "  FAIL: send note 60 failed\n");
         return 1;
     }
-    usleep(1500000);
+    safe_usleep(1500000);
     /* verify channel1_input exists */
     const char **ports = jack_get_ports(client, NULL, JACK_DEFAULT_AUDIO_TYPE, 0);
     int found = 0;
@@ -803,7 +811,7 @@ static int test_remove_channel(void) {
         fprintf(stderr, "  FAIL: send note 61 failed\n");
         return 1;
     }
-    usleep(1500000);
+    safe_usleep(1500000);
     /* verify channel1_input has disappeared */
     ports = jack_get_ports(client, NULL, JACK_DEFAULT_AUDIO_TYPE, 0);
     int still_found = 0;