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

pipewire-jack: move client-node setup right after creation

Browse source 
Move the client-node setup code right after the client-node
creation, so that they are close to each other.
This commit is contained in:
Barnabás Pőcze 2022-06-03 01:17:50 +02:00
parent d7a7d7f738
commit 15d5ab2425
1 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3359,6 +3359,24 @@ jack_client_t * jack_client_open (const char *client_name,
if (client->node == NULL) if (client->node == NULL)
goto init_failed; goto init_failed;
pw_client_node_add_listener(client->node,
&client->node_listener, &client_node_events, client);
pw_proxy_add_listener((struct pw_proxy*)client->node,
&client->proxy_listener, &node_proxy_events, client);
client->info = SPA_NODE_INFO_INIT();
client->info.max_input_ports = UINT32_MAX;
client->info.max_output_ports = UINT32_MAX;
client->info.change_mask = SPA_NODE_CHANGE_MASK_FLAGS |
SPA_NODE_CHANGE_MASK_PROPS;
client->info.flags = SPA_NODE_FLAG_RT;
client->info.props = &client->props->dict;
pw_client_node_update(client->node,
PW_CLIENT_NODE_UPDATE_INFO,
0, NULL, &client->info);
client->info.change_mask = 0;
client->show_monitor = pw_properties_get_bool(client->props, "jack.show-monitor", true); client->show_monitor = pw_properties_get_bool(client->props, "jack.show-monitor", true);
client->merge_monitor = pw_properties_get_bool(client->props, "jack.merge-monitor", false); client->merge_monitor = pw_properties_get_bool(client->props, "jack.merge-monitor", false);
client->short_name = pw_properties_get_bool(client->props, "jack.short-name", false); client->short_name = pw_properties_get_bool(client->props, "jack.short-name", false);
@ -3379,24 +3397,6 @@ jack_client_t * jack_client_open (const char *client_name,
} }
client->rt_max = pw_properties_get_int32(client->props, "rt.prio", DEFAULT_RT_MAX); client->rt_max = pw_properties_get_int32(client->props, "rt.prio", DEFAULT_RT_MAX);
pw_client_node_add_listener(client->node,
&client->node_listener, &client_node_events, client);
pw_proxy_add_listener((struct pw_proxy*)client->node,
&client->proxy_listener, &node_proxy_events, client);
client->info = SPA_NODE_INFO_INIT();
client->info.max_input_ports = UINT32_MAX;
client->info.max_output_ports = UINT32_MAX;
client->info.change_mask = SPA_NODE_CHANGE_MASK_FLAGS |
SPA_NODE_CHANGE_MASK_PROPS;
client->info.flags = SPA_NODE_FLAG_RT;
client->info.props = &client->props->dict;
pw_client_node_update(client->node,
PW_CLIENT_NODE_UPDATE_INFO,
0, NULL, &client->info);
client->info.change_mask = 0;
if (status) if (status)
*status = 0; *status = 0;