From df0a57c7891d715e10489bd53d3e2582476b64ac Mon Sep 17 00:00:00 2001 From: Timo Korvola Date: Sun, 18 Feb 2018 23:32:15 +0200 Subject: [PATCH] Minor tweaks. RTFM: ao_initialize must be called from the main thread. --- src/curses/ux_audio.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/curses/ux_audio.c b/src/curses/ux_audio.c index d814332..a4770eb 100644 --- a/src/curses/ux_audio.c +++ b/src/curses/ux_audio.c @@ -126,6 +126,7 @@ void os_init_sound(void) int err; static pthread_attr_t attr; + ao_initialize(); pthread_mutex_init(&mutex, NULL); audiobuffer_init(&music_buffer); audiobuffer_init(&bleep_buffer); @@ -135,7 +136,7 @@ void os_init_sound(void) pthread_attr_init(&attr); pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED); - err = pthread_create(&(mixer_id), &attr, (void *) &mixer, NULL); + err = pthread_create(&(mixer_id), &attr, &mixer, NULL); if (err != 0) { printf("Can't create mixer thread :[%s]", strerror(err)); exit(1); @@ -322,7 +323,6 @@ static void *mixer(void * UNUSED(arg)) ao_sample_format format; int samplecount; - ao_initialize(); default_driver = ao_default_driver_id(); shortbuffer = malloc(BUFFSIZE * sizeof(short) * 2); -- 2.34.1