Mercurial > audlegacy-plugins

changeset 1368:f611c44cc67b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Automated merge with ssh://hg.atheme.org//hg/audacious-plugins
author William Pitcock <nenolod@atheme-project.org>
date Wed, 25 Jul 2007 16:06:23 -0500
parents c75fd6894758 (diff) 4c43c38bd033 (current diff)
children 6d87598ff8a9 616d34396eef
files
diffstat 2 files changed, 4 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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);
     }
 }