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

jack: stop data thread when closing client

Browse source 
Make sure we deactivate and stop the data thread when closing a
client or we might get segfaults.
This commit is contained in:
Wim Taymans 2020-01-16 13:29:56 +01:00
parent 940aba8623
commit ae51b0acf1
1 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2121,13 +2121,13 @@ jack_client_t * jack_client_open (const char *client_name,
client->pool = pw_core_get_mempool(client->core); client->pool = pw_core_get_mempool(client->core);
pw_core_add_listener(client->core, pw_core_add_listener(client->core,
&client->core_listener, &client->core_listener,
&core_events, client); &core_events, client);
client->registry = pw_core_get_registry(client->core, client->registry = pw_core_get_registry(client->core,
PW_VERSION_REGISTRY, 0); PW_VERSION_REGISTRY, 0);
pw_registry_add_listener(client->registry, pw_registry_add_listener(client->registry,
&client->registry_listener, &client->registry_listener,
&registry_events, client); &registry_events, client);
props = SPA_DICT_INIT(items, 0); props = SPA_DICT_INIT(items, 0);
items[props.n_items++] = SPA_DICT_ITEM_INIT(PW_KEY_NODE_NAME, client_name); items[props.n_items++] = SPA_DICT_ITEM_INIT(PW_KEY_NODE_NAME, client_name);
@ -2209,21 +2209,23 @@ SPA_EXPORT
int jack_client_close (jack_client_t *client) int jack_client_close (jack_client_t *client)
{ {
struct client *c = (struct client *) client; struct client *c = (struct client *) client;
int res;
pw_log_debug(NAME" %p: close", client); pw_log_debug(NAME" %p: close", client);
do_sync(c); c->destroyed = true;
res = jack_deactivate(client);
pw_thread_loop_stop(c->context.loop); pw_thread_loop_stop(c->context.loop);
c->destroyed = true;
pw_context_destroy(c->context.context); pw_context_destroy(c->context.context);
pw_thread_loop_destroy(c->context.loop); pw_thread_loop_destroy(c->context.loop);
pw_log_debug(NAME" %p: free", client); pw_log_debug(NAME" %p: free", client);
free(c); free(c);
return 0; return res;
} }
SPA_EXPORT SPA_EXPORT