3 files changed, 17 insertions, 16 deletions

diff --git a/main.c b/main.c
index b569bbba..4aa9d88b 100644
--- a/main.c
+++ b/main.c
@@ -329,6 +329,11 @@ player_thread (uintptr_t ctx) {
         uint32_t p2;
         while (messagepump_pop(&msg, &ctx, &p1, &p2) != -1) {
             switch (msg) {
+            case M_REINIT_SOUND:
+                palsa_free ();
+                palsa_init ();
+                palsa_play ();
+                break;
             case M_TERMINATE:
                 GDK_THREADS_ENTER();
                 gtk_widget_hide (mainwin);
diff --git a/messages.h b/messages.h
index 3a297783..f0bfcb49 100644
--- a/messages.h
+++ b/messages.h
@@ -35,6 +35,7 @@ enum {
     M_FMDRAGDROP, // ctx = char* ptr, must be freed with standard free, p1 is length of data, p2 is drop_y
     M_TERMINATE, // must be sent to player thread to terminate
     M_PLAYLISTREFRESH,
+    M_REINIT_SOUND,
 };
 
 #endif // __MESSAGES_H
diff --git a/palsa.c b/palsa.c
index 967b8af8..2fe0c374 100644
--- a/palsa.c
+++ b/palsa.c
@@ -28,20 +28,8 @@
 #include "streamer.h"
 #include "conf.h"
 #include "volume.h"
-
-#if 0
-static inline void
-le_int16 (int16_t in, char *out) {
-    char *pin = (char *)∈
-#if !WORDS_BIGENDIAN
-    out[0] = pin[0];
-    out[1] = pin[1];
-#else
-    out[1] = pin[0];
-    out[0] = pin[1];
-#endif
-}
-#endif
+#include "messagepump.h"
+#include "messages.h"
 
 static snd_pcm_t *audio;
 static int16_t *samplebuffer;
@@ -51,6 +39,7 @@ static int alsa_rate = 48000;
 static int state; // 0 = stopped, 1 = playing, 2 = pause
 static uintptr_t mutex;
 static int canpause;
+static intptr_t alsa_tid;
 
 static void
 palsa_callback (char *stream, int len);
@@ -191,7 +180,7 @@ palsa_init (void) {
 
     alsa_terminate = 0;
     mutex = mutex_create ();
-    thread_start (palsa_thread, 0);
+    alsa_tid = thread_start (palsa_thread, 0);
 
     return 0;
 
@@ -209,6 +198,9 @@ palsa_free (void) {
     if (audio) {
         mutex_lock (mutex);
         alsa_terminate = 1;
+        if (alsa_tid) {
+            thread_join (alsa_tid);
+        }
         snd_pcm_close(audio);
         audio = NULL;
         if (samplebuffer) {
@@ -317,17 +309,20 @@ palsa_thread (uintptr_t context) {
            has elapsed.
          */
         if ((err = snd_pcm_wait (audio, 1000)) < 0) {
+            messagepump_push (M_REINIT_SOUND, 0, 0, 0);
+            mutex_unlock (mutex);
+            break;
 #if 0
             fprintf (stderr, "alsa poll failed (%s)\n", strerror (errno));
             if ((err = snd_pcm_prepare (audio)) < 0) {
                 fprintf (stderr, "cannot prepare audio interface for use (%s)\n",
                         snd_strerror (err));
             }
-#endif
             snd_pcm_prepare (audio);
             snd_pcm_start (audio);
             mutex_unlock (mutex);
             continue;
+#endif
         }	           
 
         /* find out how much space is available for playback data */