Commit 00deb25e authored by Rémi Denis-Courmont's avatar 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.
parent 0dbba8ba
...@@ -163,6 +163,10 @@ static void stream_moved_cb(pa_stream *s, void *userdata) ...@@ -163,6 +163,10 @@ static void stream_moved_cb(pa_stream *s, void *userdata)
sink_info_cb, aout); sink_info_cb, aout);
if (likely(op != NULL)) if (likely(op != NULL))
pa_operation_unref(op); 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) static void stream_overflow_cb(pa_stream *s, void *userdata)
...@@ -553,7 +557,6 @@ static int Open(vlc_object_t *obj) ...@@ -553,7 +557,6 @@ static int Open(vlc_object_t *obj)
error(aout, "cannot connect stream", ctx); error(aout, "cannot connect stream", ctx);
goto fail; goto fail;
} }
stream_moved_cb(s, aout);
const struct pa_buffer_attr *pba = pa_stream_get_buffer_attr(s); const struct pa_buffer_attr *pba = pa_stream_get_buffer_attr(s);
msg_Dbg(aout, "using buffer metrics: maxlength=%u, tlength=%u, " msg_Dbg(aout, "using buffer metrics: maxlength=%u, tlength=%u, "
...@@ -571,6 +574,7 @@ static int Open(vlc_object_t *obj) ...@@ -571,6 +574,7 @@ static int Open(vlc_object_t *obj)
/* We may need to wait for completion... once LibVLC supports this */ /* We may need to wait for completion... once LibVLC supports this */
if (op != NULL) if (op != NULL)
pa_operation_unref(op); pa_operation_unref(op);
stream_moved_cb(s, aout);
pa_threaded_mainloop_unlock(mainloop); pa_threaded_mainloop_unlock(mainloop);
aout->output.pf_play = Play; aout->output.pf_play = Play;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment