Minor tweaks.

RTFM: ao_initialize must be called from the main thread.

diff --git a/src/curses/ux_audio.c b/src/curses/ux_audio.c
index d8143323d8ddf7836edb7e5e6fd3b2ac4a4eea24..a4770eb0807e3aa9ee0512be6b9e8f3d799de98a 100644 (file)
--- 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);