[vlc-commits] commit: Pulse: fix warning ( Rémi Denis-Courmont )

git version control git at videolan.org
Wed Mar 3 20:35:47 CET 2010


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Wed Mar  3 21:20:46 2010 +0200| [e05d34f19d1e10cfb9297457e61e58974b772612] | committer: Rémi Denis-Courmont 

Pulse: fix warning

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e05d34f19d1e10cfb9297457e61e58974b772612
---

 modules/audio_output/pulse.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/audio_output/pulse.c b/modules/audio_output/pulse.c
index 8ef3e4c..c4580b6 100644
--- a/modules/audio_output/pulse.c
+++ b/modules/audio_output/pulse.c
@@ -338,7 +338,6 @@ static void Close ( vlc_object_t *p_this )
     msg_Dbg(p_aout, "Pulse Close");
 
     if(p_sys->stream){
-        pa_operation *o;
         pa_threaded_mainloop_lock(p_sys->mainloop);
         pa_stream_set_write_callback(p_sys->stream, NULL, NULL);
 
@@ -347,7 +346,8 @@ static void Close ( vlc_object_t *p_this )
  * And disabling this speeds up closing pulseaudio quite a lot (atleast for me).
  */
 #if 0
-        if((o = pa_stream_drain(p_sys->stream, success_cb, p_aout))){
+        pa_operation *o = pa_stream_drain(p_sys->stream, success_cb, p_aout);
+        if(o){
             while (pa_operation_get_state(o) != PA_OPERATION_DONE) {
                 CHECK_DEAD_GOTO(fail);
                 pa_threaded_mainloop_wait(p_sys->mainloop);



More information about the vlc-commits mailing list