# HG changeset patch
# User William Pitcock <nenolod@atheme-project.org>
# Date 1185397583 18000
# Node ID f611c44cc67baf273f5a2b680247db9455ea9506
# Parent  c75fd689475804474c34966cc1067149a9e29b56# Parent  4c43c38bd033e137fc9cdf6650b0134ca05f90aa
Automated merge with ssh://hg.atheme.org//hg/audacious-plugins

diff -r 4c43c38bd033 -r f611c44cc67b src/cue/Makefile
diff -r 4c43c38bd033 -r f611c44cc67b src/wav/wav-sndfile.c
--- a/src/wav/wav-sndfile.c	Wed Jul 25 23:17:57 2007 +0900
+++ b/src/wav/wav-sndfile.c	Wed Jul 25 16:06:23 2007 -0500
@@ -275,8 +275,8 @@
 
 	playback->playing = TRUE;
 
-	decode_thread = g_thread_create ((GThreadFunc)play_loop, playback, TRUE, NULL);
-
+	decode_thread = g_thread_self();
+        play_loop(playback);
 }
 
 static void
diff -r 4c43c38bd033 -r f611c44cc67b src/wav/wav.c
--- a/src/wav/wav.c	Wed Jul 25 23:17:57 2007 +0900
+++ b/src/wav/wav.c	Wed Jul 25 16:06:23 2007 -0500
@@ -303,8 +303,6 @@
 
     }
     vfs_fclose(wav_file->file);
-
-    g_thread_exit(NULL);
     return NULL;
 }
 
@@ -422,7 +420,8 @@
                         wav_file->samples_per_sec, wav_file->channels);
         g_free(name);
         wav_file->seek_to = -1;
-        decode_thread = g_thread_create(play_loop, playback, TRUE, NULL);
+        decode_thread = g_thread_self();
+        play_loop(playback);
     }
 }