[vlc-commits] PulseAudio: update audio-device

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Tue Apr 12 20:25:49 2011 +0300| [00deb25ee32ea61bbb7f8bcc6b909cb17bf27b14] | committer: Rémi Denis-Courmont

PulseAudio: update audio-device

This keeps the VLC value in sync with the PulseAudio one. For some
reason, the Qt4 interface does not pick up the correct default though.

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

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

diff --git a/modules/audio_output/pulse.c b/modules/audio_output/pulse.c
index 3041a5b..0f97a36 100644
--- a/modules/audio_output/pulse.c
+++ b/modules/audio_output/pulse.c
@@ -163,6 +163,10 @@ static void stream_moved_cb(pa_stream *s, void *userdata)
                                            sink_info_cb, aout);
     if (likely(op != NULL))
         pa_operation_unref(op);
+
+    /* Update the variable if someone else moved our stream */
+    var_Change(aout, "audio-device", VLC_VAR_SETVALUE,
+               &(vlc_value_t){ .i_int = idx }, NULL);
 }
 
 static void stream_overflow_cb(pa_stream *s, void *userdata)
@@ -553,7 +557,6 @@ static int Open(vlc_object_t *obj)
         error(aout, "cannot connect stream", ctx);
         goto fail;
     }
-    stream_moved_cb(s, aout);
 
     const struct pa_buffer_attr *pba = pa_stream_get_buffer_attr(s);
     msg_Dbg(aout, "using buffer metrics: maxlength=%u, tlength=%u, "
@@ -571,6 +574,7 @@ static int Open(vlc_object_t *obj)
     /* We may need to wait for completion... once LibVLC supports this */
     if (op != NULL)
         pa_operation_unref(op);
+    stream_moved_cb(s, aout);
     pa_threaded_mainloop_unlock(mainloop);
 
     aout->output.pf_play = Play;