Skip to content

V
vlc-2-2
Commit 0afba62b authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

PulseAudio: don't assert at exit if PulseAudio died

parent 84f21de4
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 6 deletions
modules/audio_output/pulse.c
View file @ 0afba62b
...@@ -340,14 +340,18 @@ static void Close (vlc_object_t *obj) ...@@ -340,14 +340,18 @@ static void Close (vlc_object_t *obj)
pa_stream_set_write_callback(sys->stream, NULL, NULL); pa_stream_set_write_callback(sys->stream, NULL, NULL);
o = pa_stream_flush(sys->stream, success_cb, sys); o = pa_stream_flush(sys->stream, success_cb, sys);
while (pa_operation_get_state(o) == PA_OPERATION_RUNNING) if (o != NULL) {
pa_threaded_mainloop_wait(sys->mainloop); while (pa_operation_get_state(o) == PA_OPERATION_RUNNING)
pa_operation_unref(o); pa_threaded_mainloop_wait(sys->mainloop);
pa_operation_unref(o);
}
o = pa_stream_drain(sys->stream, success_cb, sys); o = pa_stream_drain(sys->stream, success_cb, sys);
while (pa_operation_get_state(o) == PA_OPERATION_RUNNING) if (o != NULL) {
pa_threaded_mainloop_wait(sys->mainloop); while (pa_operation_get_state(o) == PA_OPERATION_RUNNING)
pa_operation_unref(o); pa_threaded_mainloop_wait(sys->mainloop);
pa_operation_unref(o);
}
pa_threaded_mainloop_unlock(sys->mainloop); pa_threaded_mainloop_unlock(sys->mainloop);
} }
......
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