paul
/
monocoque
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clean up debug code in pulseaudio mainloop start

This commit is contained in:
Paul Dino Jones 2026-03-03 23:37:45 -05:00
parent 4caabd24a7
commit f96277ef71
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/monocoque/devices/sound.c
View File

@ -19,10 +19,8 @@ int setupsound()
slogi("connecting pulseaudio..."); slogi("connecting pulseaudio...");
// Get a mainloop and its context // Get a mainloop and its context
mainloop = pa_threaded_mainloop_new(); mainloop = pa_threaded_mainloop_new();
assert(mainloop);
mainloop_api = pa_threaded_mainloop_get_api(mainloop); mainloop_api = pa_threaded_mainloop_get_api(mainloop);
context = pa_context_new(mainloop_api, "Monocoque"); context = pa_context_new(mainloop_api, "Monocoque");
assert(context);
pa_context_set_state_callback(context, &context_state_cb, mainloop); pa_context_set_state_callback(context, &context_state_cb, mainloop);
@ -30,13 +28,17 @@ int setupsound()
pa_threaded_mainloop_lock(mainloop); pa_threaded_mainloop_lock(mainloop);
// Start the mainloop // Start the mainloop
<<<<<<< Updated upstream
assert(pa_threaded_mainloop_start(mainloop) == 0); assert(pa_threaded_mainloop_start(mainloop) == 0);
assert(pa_context_connect(context, NULL, 0, NULL) == 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
// Wait for the context to be ready // Wait for the context to be ready
for(;;) { for(;;) {
pa_context_state_t context_state = pa_context_get_state(context); pa_context_state_t context_state = pa_context_get_state(context);
assert(PA_CONTEXT_IS_GOOD(context_state));
if (context_state == PA_CONTEXT_READY) break; if (context_state == PA_CONTEXT_READY) break;
pa_threaded_mainloop_wait(mainloop); pa_threaded_mainloop_wait(mainloop);
} }