rpms/audacious-plugins/F-10 audacious-plugins-1.5.1-sndfile-playfix.patch, NONE, 1.1 audacious-plugins.spec, 1.40, 1.41

[Michael Schwendt]

Author: mschwendt

Update of /cvs/pkgs/rpms/audacious-plugins/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29518/F-10

Modified Files:
	audacious-plugins.spec 
Added Files:
	audacious-plugins-1.5.1-sndfile-playfix.patch 
Log Message:
* Wed Oct 28 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5.1-15
- Remove decode_thread from sndfile plugin to fix playback.


audacious-plugins-1.5.1-sndfile-playfix.patch:
 plugin.c |   18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

--- NEW FILE audacious-plugins-1.5.1-sndfile-playfix.patch ---
diff -Nur audacious-plugins-1.5.1-sndfile-cleanup/src/sndfile/plugin.c audacious-plugins-1.5.1-sndfile-playfix/src/sndfile/plugin.c
--- audacious-plugins-1.5.1-sndfile-cleanup/src/sndfile/plugin.c	2009-10-28 14:45:17.432796535 +0100
+++ audacious-plugins-1.5.1-sndfile-playfix/src/sndfile/plugin.c	2009-10-28 14:43:21.000000000 +0100
@@ -49,7 +49,6 @@
 static glong seek_time = -1;
 static volatile char pause_flag;
 
-static GThread *decode_thread;
 static GMutex *decode_mutex;
 static GCond *decode_cond;
 
@@ -395,17 +394,8 @@
         samples = sf_read_short (sndfile, buffer, BUFFER_SIZE);
 
         if (samples > 0 && playback->playing == TRUE) {
-            while ((playback->output->buffer_free () < samples) &&
-                   playback->playing == TRUE) {
-                g_get_current_time(&sleeptime);
-                g_time_val_add(&sleeptime, 500000);
-                g_mutex_lock(decode_mutex);
-                g_cond_timed_wait(decode_cond, decode_mutex, &sleeptime);
-                g_mutex_unlock(decode_mutex);
-
                 if (playback->playing == FALSE)
                     break;
-            }
 
             playback->pass_audio(playback, FMT_S16_NE, sfinfo.channels, 
                                  samples * sizeof(buffer[0]), buffer, &playback->playing);
@@ -483,9 +473,9 @@
 
     playback->playing = TRUE;
 
-    decode_thread = g_thread_self();
     playback->set_pb_ready(playback);
     play_loop(playback);
+    playback->playing = FALSE;
 }
 
 static void
@@ -497,18 +487,12 @@
 static void
 play_stop (InputPlayback *playback)
 {
-    if (decode_thread == NULL)
-        return;
-
     g_mutex_lock(decode_mutex);
     playback->playing = FALSE;
     g_mutex_unlock(decode_mutex);
     g_cond_signal(decode_cond);
 
-    g_thread_join (decode_thread);
-
     sndfile = NULL;
-    decode_thread = NULL;
     seek_time = -1;
 }
 


Index: audacious-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/F-10/audacious-plugins.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- audacious-plugins.spec	26 Oct 2009 11:27:32 -0000	1.40
+++ audacious-plugins.spec	28 Oct 2009 13:53:27 -0000	1.41
@@ -4,7 +4,7 @@
 
 Name:           audacious-plugins
 Version:        1.5.1
-Release:        14%{?dist}
+Release:        15%{?dist}
 Summary:        Plugins for the Audacious media player
 Group:          Applications/Multimedia
 
@@ -28,6 +28,7 @@ Patch7:         audacious-plugins-1.5.1-
 Patch8:         audacious-plugins-1.5.1-sndfile-cleanup.patch
 Patch9:         audacious-plugins-1.5.1-pulseaudio-volume.patch
 Patch10:        audacious-plugins-1.5.1-pulseaudio-volume-accuracy.patch
+Patch11:        audacious-plugins-1.5.1-sndfile-playfix.patch
 
 # alsa-ng plugin from 2.1 devel up to 2.2 alpha1
 Patch50: audacious-plugins-1.5.1-alsa-ng.patch
@@ -182,6 +183,8 @@ vortex compressed files.
 %patch9 -p1 -b .pulseaudio-volume
 %patch10 -p1 -b .pulseaudio-volume-accuracy
 
+%patch11 -p1 -b .sndfile-playfix
+
 %patch50 -p1 -b .alsa-ng
 %patch51 -p1 -b .alsa-ng2
 %patch52 -p1 -b .mixer-not-ready
@@ -280,6 +283,9 @@ update-desktop-database &> /dev/null || 
 
 
 %changelog
+* Wed Oct 28 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5.1-15
+- Remove decode_thread from sndfile plugin to fix playback.
+
 * Wed Oct 21 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5.1-14
 - Set buffer_time_min in underruns patch. Depend on default buffer size.