From d8de1cb2557a44e17bcb3525aa355cf3f5293aae Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 12 Oct 2021 14:21:11 +1000 Subject: [PATCH] modules: switch to new property helpers --- src/modules/module-link-factory.c | 4 +--- src/modules/module-loopback.c | 6 ++---- src/modules/module-portal.c | 5 ++--- src/modules/spa/module-node-factory.c | 5 ++--- 4 files changed, 7 insertions(+), 13 deletions(-) diff --git a/src/modules/module-link-factory.c b/src/modules/module-link-factory.c index 7550a337d..aec777037 100644 --- a/src/modules/module-link-factory.c +++ b/src/modules/module-link-factory.c @@ -367,7 +367,6 @@ static void *create_object(void *_data, const char *output_node_str, *input_node_str; const char *output_port_str, *input_port_str; struct link_data *ld; - const char *str; int res; bool linger; @@ -401,8 +400,7 @@ static void *create_object(void *_data, if (inport == NULL) goto error_input_port; - str = pw_properties_get(properties, PW_KEY_OBJECT_LINGER); - linger = str ? pw_properties_parse_bool(str) : false; + linger = pw_properties_get_bool(properties, PW_KEY_OBJECT_LINGER, false); pw_properties_setf(properties, PW_KEY_FACTORY_ID, "%d", pw_impl_factory_get_info(d->this)->id); diff --git a/src/modules/module-loopback.c b/src/modules/module-loopback.c index 845e90ee2..15dfaa4a5 100644 --- a/src/modules/module-loopback.c +++ b/src/modules/module-loopback.c @@ -372,10 +372,8 @@ static void parse_audio_info(struct pw_properties *props, struct spa_audio_info_ *info = SPA_AUDIO_INFO_RAW_INIT( .format = SPA_AUDIO_FORMAT_F32P); - if ((str = pw_properties_get(props, PW_KEY_AUDIO_RATE)) != NULL) - info->rate = atoi(str); - if ((str = pw_properties_get(props, PW_KEY_AUDIO_CHANNELS)) != NULL) - info->channels = atoi(str); + info->rate = pw_properties_get_int32(props, PW_KEY_AUDIO_RATE, 0); + info->channels = pw_properties_get_uint32(props, PW_KEY_AUDIO_CHANNELS, 0); if ((str = pw_properties_get(props, SPA_KEY_AUDIO_POSITION)) != NULL) parse_position(info, str, strlen(str)); } diff --git a/src/modules/module-portal.c b/src/modules/module-portal.c index d30da3844..27ed7f41a 100644 --- a/src/modules/module-portal.c +++ b/src/modules/module-portal.c @@ -103,7 +103,6 @@ context_check_access(void *data, struct pw_impl_client *client) { struct impl *impl = data; const struct pw_properties *props; - const char *str; struct pw_permission permissions[1]; struct spa_dict_item items[1]; pid_t pid; @@ -114,10 +113,10 @@ context_check_access(void *data, struct pw_impl_client *client) if ((props = pw_impl_client_get_properties(client)) == NULL) return; - if ((str = pw_properties_get(props, PW_KEY_SEC_PID)) == NULL) + if (pw_properties_fetch_int32(props, PW_KEY_SEC_PID, &pid) < 0) return; - if (!spa_atoi32(str, &pid, 10) || pid != impl->portal_pid) + if (pid != impl->portal_pid) return; items[0] = SPA_DICT_ITEM_INIT(PW_KEY_ACCESS, "portal"); diff --git a/src/modules/spa/module-node-factory.c b/src/modules/spa/module-node-factory.c index 05d0e9a03..18407a788 100644 --- a/src/modules/spa/module-node-factory.c +++ b/src/modules/spa/module-node-factory.c @@ -107,7 +107,7 @@ static void *create_object(void *_data, struct factory_data *data = _data; struct pw_context *context = data->context; struct pw_impl_node *node; - const char *factory_name, *str; + const char *factory_name; struct node_data *nd; int res; struct pw_impl_client *client; @@ -123,8 +123,7 @@ static void *create_object(void *_data, pw_properties_setf(properties, PW_KEY_FACTORY_ID, "%d", pw_global_get_id(pw_impl_factory_get_global(data->this))); - str = pw_properties_get(properties, PW_KEY_OBJECT_LINGER); - linger = str ? pw_properties_parse_bool(str) : false; + linger = pw_properties_get_bool(properties, PW_KEY_OBJECT_LINGER, false); client = resource ? pw_resource_get_client(resource) : NULL; if (client && !linger) {