mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-01 22:58:50 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

jack: use the context data thread

Browse source 
Configure the data thread as cancelable, there is no need to make
another thread.

See #683
This commit is contained in:
Wim Taymans 2021-02-08 15:29:48 +01:00
parent cd5ceae69e
commit 0f028dab40
1 changed files with 4 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2375,8 +2375,6 @@ jack_client_t * jack_client_open (const char *client_name,
jack_status_t *status, ...) jack_status_t *status, ...)
{ {
struct client *client; struct client *client;
struct spa_dict props;
struct spa_dict_item items[1];
const struct spa_support *support; const struct spa_support *support;
uint32_t n_support; uint32_t n_support;
const char *str; const char *str;
@ -2409,6 +2407,7 @@ jack_client_t * jack_client_open (const char *client_name,
client->context.l, client->context.l,
pw_properties_new( pw_properties_new(
PW_KEY_CONTEXT_PROFILE_MODULES, "default,rtkit", PW_KEY_CONTEXT_PROFILE_MODULES, "default,rtkit",
"loop.cancel", "true",
NULL), NULL),
0); 0);
client->allow_mlock = client->context.context->defaults.mem_allow_mlock; client->allow_mlock = client->context.context->defaults.mem_allow_mlock;
@ -2431,12 +2430,7 @@ jack_client_t * jack_client_open (const char *client_name,
mix2 = mix2_sse; mix2 = mix2_sse;
#endif #endif
} }
client->loop = client->context.context->data_loop_impl;
props = SPA_DICT_INIT(items, 0);
items[props.n_items++] = SPA_DICT_ITEM_INIT("loop.cancel", "true");
client->loop = pw_data_loop_new(&props);
if (client->loop == NULL)
goto init_failed;
spa_list_init(&client->links); spa_list_init(&client->links);
spa_list_init(&client->rt.target_links); spa_list_init(&client->rt.target_links);
@ -2604,7 +2598,6 @@ int jack_client_close (jack_client_t *client)
pw_log_debug(NAME" %p: free", client); pw_log_debug(NAME" %p: free", client);
pthread_mutex_destroy(&c->context.lock); pthread_mutex_destroy(&c->context.lock);
pw_data_loop_destroy(c->loop);
pw_properties_free(c->props); pw_properties_free(c->props);
free(c); free(c);
@ -2700,14 +2693,11 @@ static int do_activate(struct client *c)
pw_thread_loop_lock(c->context.loop); pw_thread_loop_lock(c->context.loop);
if ((res = pw_data_loop_start(c->loop)) < 0)
goto done;
pw_log_debug(NAME" %p: activate", c); pw_log_debug(NAME" %p: activate", c);
pw_client_node_set_active(c->node, true); pw_client_node_set_active(c->node, true);
res = do_sync(c); res = do_sync(c);
done:
pw_thread_loop_unlock(c->context.loop); pw_thread_loop_unlock(c->context.loop);
return res; return res;
} }
@ -2758,6 +2748,7 @@ int jack_deactivate (jack_client_t *client)
res = do_sync(c); res = do_sync(c);
pw_data_loop_start(c->loop);
pw_thread_loop_unlock(c->context.loop); pw_thread_loop_unlock(c->context.loop);
if (res < 0) if (res < 0)