mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-31 22:25:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

jack: use explicit variable to keep track of transport

Browse source
This commit is contained in:
Wim Taymans 2019-11-28 12:57:06 +01:00
parent e3a1c4151e
commit a1801b690f
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
pipewire-jack/src/pipewire-jack.c
View file

@ -311,6 +311,7 @@ struct client {
unsigned int destroyed:1; unsigned int destroyed:1;
unsigned int first:1; unsigned int first:1;
unsigned int thread_entered:1; unsigned int thread_entered:1;
unsigned int has_transport:1;
jack_position_t jack_position; jack_position_t jack_position;
jack_transport_state_t jack_state; jack_transport_state_t jack_state;
@ -1077,7 +1078,7 @@ static void clean_transport(struct client *c)
{ {
struct link *l; struct link *l;
if (c->node_id == SPA_ID_INVALID) if (!c->has_transport)
return; return;
pw_data_loop_stop(c->loop); pw_data_loop_stop(c->loop);
@ -1089,7 +1090,7 @@ static void clean_transport(struct client *c)
clear_link(c, l); clear_link(c, l);
pw_array_clear(&c->links); pw_array_clear(&c->links);
c->node_id = SPA_ID_INVALID; c->has_transport = false;
} }
static int client_node_transport(void *object, static int client_node_transport(void *object,
@ -1112,13 +1113,16 @@ static int client_node_transport(void *object,
c->activation = c->mem->ptr; c->activation = c->mem->ptr;
pw_log_debug(NAME" %p: create client transport with fds %d %d for node %u", pw_log_debug(NAME" %p: create client transport with fds %d %d for node %u",
c, readfd, writefd, node_id); c, readfd, writefd, c->node_id);
close(writefd); close(writefd);
c->socket_source = pw_loop_add_io(c->loop->loop, c->socket_source = pw_loop_add_io(c->loop->loop,
readfd, readfd,
SPA_IO_ERR | SPA_IO_HUP, SPA_IO_ERR | SPA_IO_HUP,
true, on_rtsocket_condition, c); true, on_rtsocket_condition, c);
c->has_transport = true;
return 0; return 0;
} }