]> git.sesse.net Git - vlc/commitdiff
Pulse: fix warning
authorRémi Denis-Courmont <remi@remlab.net>
Wed, 3 Mar 2010 19:20:46 +0000 (21:20 +0200)
committerRémi Denis-Courmont <remi@remlab.net>
Wed, 3 Mar 2010 19:20:46 +0000 (21:20 +0200)
modules/audio_output/pulse.c

index 8ef3e4cccfbffa824373714f3a1210be506336c4..c4580b62af14e71e8e25a23d3d1bf32b9b529cbc 100644 (file)
@@ -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);