From 15d5ab2425a2f4ae4978e4d6bf0cf9dcf7933e67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Barnab=C3=A1s=20P=C5=91cze?= Date: Fri, 3 Jun 2022 01:17:50 +0200 Subject: [PATCH] pipewire-jack: move client-node setup right after creation Move the client-node setup code right after the client-node creation, so that they are close to each other. --- pipewire-jack/src/pipewire-jack.c | 36 +++++++++++++++---------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/pipewire-jack/src/pipewire-jack.c b/pipewire-jack/src/pipewire-jack.c index c745c80de..16624538c 100644 --- a/pipewire-jack/src/pipewire-jack.c +++ b/pipewire-jack/src/pipewire-jack.c @@ -3359,6 +3359,24 @@ jack_client_t * jack_client_open (const char *client_name, if (client->node == NULL) 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->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); @@ -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); - 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) *status = 0;