From 7f776f279b879afe849eff45f681a55b1a5547b6 Mon Sep 17 00:00:00 2001 From: Paul Dino Jones Date: Tue, 3 Mar 2026 23:42:18 -0500 Subject: [PATCH] fix compilation error --- src/monocoque/devices/sound.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/monocoque/devices/sound.c b/src/monocoque/devices/sound.c index 17c6a7b..cb9405c 100644 --- a/src/monocoque/devices/sound.c +++ b/src/monocoque/devices/sound.c @@ -28,13 +28,8 @@ int setupsound() pa_threaded_mainloop_lock(mainloop); // Start the mainloop -<<<<<<< Updated upstream - assert(pa_threaded_mainloop_start(mainloop) == 0); - assert(pa_context_connect(context, NULL, 0, NULL) == 0); -======= pa_threaded_mainloop_start(mainloop); - pa_context_connect(context, NULL, PA_CONTEXT_NOAUTOSPAWN, NULL); ->>>>>>> Stashed changes + pa_context_connect(context, NULL, 0, NULL); // Wait for the context to be ready for(;;) {