mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-04 13:30:12 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

pulse-server: send any STREAM_KILLED command last

Browse source 
Mark the stream as killed and then only send the STREAM_KILLED
command after we send the other pending commands.
This commit is contained in:
Wim Taymans 2021-03-22 10:29:45 +01:00
parent 6b6bf1e1d0
commit 80a6583271
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/modules/module-protocol-pulse/pulse-server.c
View file

@ -241,6 +241,7 @@ struct stream {
unsigned int is_underrun:1; unsigned int is_underrun:1;
unsigned int in_prebuf:1; unsigned int in_prebuf:1;
unsigned int done:1; unsigned int done:1;
unsigned int killed:1;
}; };
struct server { struct server {
@ -1118,6 +1119,9 @@ static void stream_free(struct stream *stream)
if (stream->drain_tag) if (stream->drain_tag)
reply_error(client, -1, stream->drain_tag, -ENOENT); reply_error(client, -1, stream->drain_tag, -ENOENT);
if (stream->killed)
send_stream_killed(stream);
/* force processing of all pending messages before we destroy /* force processing of all pending messages before we destroy
* the stream */ * the stream */
pw_loop_invoke(impl->loop, NULL, 0, NULL, 0, false, client); pw_loop_invoke(impl->loop, NULL, 0, NULL, 0, false, client);
@ -1541,7 +1545,7 @@ static void stream_state_changed(void *data, enum pw_stream_state old,
break; break;
case PW_STREAM_STATE_UNCONNECTED: case PW_STREAM_STATE_UNCONNECTED:
if (!client->disconnecting) if (!client->disconnecting)
send_stream_killed(stream); stream->killed = true;
stream->done = true; stream->done = true;
break; break;
case PW_STREAM_STATE_CONNECTING: case PW_STREAM_STATE_CONNECTING: