mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-03 09:01:54 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

pulse-server: improve stream cleanup

Browse source 
First disconnect the stream this ensures no more process events are
called. Then flush out the pending events, then destroy the stream.

Fixes #1451
This commit is contained in:
Wim Taymans 2021-07-26 11:48:00 +02:00
parent 78f52a7073
commit 9f6890e10e
1 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/modules/module-protocol-pulse/stream.c
View file

@ -56,17 +56,18 @@ void stream_free(struct stream *stream)
if (stream->killed) if (stream->killed)
stream_send_killed(stream); stream_send_killed(stream);
/* force processing of all pending messages before we destroy
* the stream */
pw_loop_invoke(impl->loop, NULL, 0, NULL, 0, false, client);
if (stream->channel != SPA_ID_INVALID)
pw_map_remove(&client->streams, stream->channel);
if (stream->stream) { if (stream->stream) {
spa_hook_remove(&stream->stream_listener); spa_hook_remove(&stream->stream_listener);
pw_stream_disconnect(stream->stream);
/* force processing of all pending messages before we destroy
* the stream */
pw_loop_invoke(impl->loop, NULL, 0, NULL, 0, false, client);
pw_stream_destroy(stream->stream); pw_stream_destroy(stream->stream);
} }
if (stream->channel != SPA_ID_INVALID)
pw_map_remove(&client->streams, stream->channel);
pw_work_queue_cancel(impl->work_queue, stream, SPA_ID_INVALID); pw_work_queue_cancel(impl->work_queue, stream, SPA_ID_INVALID);