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: don't overwrite any PIPEWIRE_PROPS values

Browse source
This commit is contained in:
Wim Taymans 2020-08-11 12:12:37 +02:00
parent f73a0c97e3
commit cc044b0e08
1 changed files with 16 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2338,7 +2338,7 @@ jack_client_t * jack_client_open (const char *client_name,
{ {
struct client *client; struct client *client;
struct spa_dict props; struct spa_dict props;
struct spa_dict_item items[6]; 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;
@ -2441,16 +2441,21 @@ jack_client_t * jack_client_open (const char *client_name,
if (client->props == NULL) if (client->props == NULL)
goto init_failed; goto init_failed;
props = SPA_DICT_INIT(items, 0); if (pw_properties_get(client->props, PW_KEY_NODE_NAME) == NULL)
items[props.n_items++] = SPA_DICT_ITEM_INIT(PW_KEY_NODE_NAME, client_name); pw_properties_set(client->props, PW_KEY_NODE_NAME, client_name);
items[props.n_items++] = SPA_DICT_ITEM_INIT(PW_KEY_MEDIA_TYPE, "Audio"); if (pw_properties_get(client->props, PW_KEY_NODE_DESCRIPTION) == NULL)
items[props.n_items++] = SPA_DICT_ITEM_INIT(PW_KEY_MEDIA_CATEGORY, "Duplex"); pw_properties_set(client->props, PW_KEY_NODE_DESCRIPTION, client_name);
items[props.n_items++] = SPA_DICT_ITEM_INIT(PW_KEY_MEDIA_ROLE, "DSP"); if (pw_properties_get(client->props, PW_KEY_MEDIA_TYPE) == NULL)
if ((str = getenv("PIPEWIRE_LATENCY")) != NULL) pw_properties_set(client->props, PW_KEY_MEDIA_TYPE, "Audio");
items[props.n_items++] = SPA_DICT_ITEM_INIT(PW_KEY_NODE_LATENCY, str); if (pw_properties_get(client->props, PW_KEY_MEDIA_CATEGORY) == NULL)
items[props.n_items++] = SPA_DICT_ITEM_INIT(PW_KEY_NODE_ALWAYS_PROCESS, "true"); pw_properties_set(client->props, PW_KEY_MEDIA_CATEGORY, "Duplex");
if (pw_properties_get(client->props, PW_KEY_MEDIA_ROLE) == NULL)
pw_properties_add(client->props, &props); pw_properties_set(client->props, PW_KEY_MEDIA_ROLE, "DSP");
if (pw_properties_get(client->props, PW_KEY_NODE_LATENCY) == NULL &&
(str = getenv("PIPEWIRE_LATENCY")) != NULL)
pw_properties_set(client->props, PW_KEY_NODE_LATENCY, str);
if (pw_properties_get(client->props, PW_KEY_NODE_ALWAYS_PROCESS) == NULL)
pw_properties_set(client->props, PW_KEY_NODE_ALWAYS_PROCESS, "true");
client->node = pw_core_create_object(client->core, client->node = pw_core_create_object(client->core,
"client-node", "client-node",