From fb884b9441d559e13223dba9b9fb4a1af00193c9 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 12 Oct 2021 14:14:03 +1000 Subject: [PATCH] jack: switch to new property helpers --- pipewire-jack/src/pipewire-jack.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/pipewire-jack/src/pipewire-jack.c b/pipewire-jack/src/pipewire-jack.c index 8100215e8..9915c573b 100644 --- a/pipewire-jack/src/pipewire-jack.c +++ b/pipewire-jack/src/pipewire-jack.c @@ -3032,15 +3032,10 @@ jack_client_t * jack_client_open (const char *client_name, execute_match, client); } - if ((str = pw_properties_get(client->props, "jack.merge-monitor")) != NULL) - client->merge_monitor = pw_properties_parse_bool(str); - if ((str = pw_properties_get(client->props, "jack.short-name")) != NULL) - client->short_name = pw_properties_parse_bool(str); - if ((str = pw_properties_get(client->props, "jack.filter-name")) != NULL) - client->filter_name = pw_properties_parse_bool(str); - - str = pw_properties_get(client->props, "jack.locked-process"); - client->locked_process = str ? pw_properties_parse_bool(str) : 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); + client->filter_name = pw_properties_get_bool(client->props, "jack.filter-name", false); + client->locked_process = pw_properties_get_bool(client->props, "jack.locked-process", true); client->self_connect_mode = SELF_CONNECT_ALLOW; if ((str = pw_properties_get(client->props, "jack.self-connect-mode")) != NULL) { @@ -3053,9 +3048,7 @@ jack_client_t * jack_client_open (const char *client_name, else if (spa_streq(str, "ignore-all")) client->self_connect_mode = SELF_CONNECT_IGNORE_ALL; } - client->rt_max = DEFAULT_RT_MAX; - if ((str = pw_properties_get(client->props, "rt.prio")) != NULL) - client->rt_max = atoi(str); + client->rt_max = pw_properties_get_int32(client->props, "rt.prio", DEFAULT_RT_MAX); pthread_mutex_init(&client->context.lock, NULL); pthread_mutex_init(&client->rt_lock, NULL);