mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-29 05:40:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

conf: emit callback for config sections

Browse source 
Instead of reading all config section in properties, emit a callback
for each section, allow for filtering on a particular section as
well. In the callback, update the section value in the properties.

Deprecate get_conf_section(), it can't support multiple section
updates.
This commit is contained in:
Wim Taymans 2022-02-01 17:08:33 +01:00
parent 5839400aa0
commit f273e2a716
2 changed files with 52 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

60
src/pipewire/conf.c
View file

@ -351,31 +351,49 @@ error:
return res;
}
static int conf_load(const char *path, const char *prefix, const char *name,
struct pw_properties *conf)
static int conf_for_each(const char *path, const char *section,
int (*callback)(void *user_data, const char *location, const char *section,
const char *val, size_t len), void *user_data)
{
char *data;
struct stat sbuf;
int fd;
int fd, len, res;
struct spa_json it[2];
char key[1024];
const char *val;
if ((fd = open(path, O_CLOEXEC | O_RDONLY)) < 0) {
pw_log_warn("%p: error loading config '%s': %m", conf, path);
pw_log_warn("%p: error loading config '%s': %m", user_data, path);
return -errno;
}
pw_log_info("%p: loading config '%s'", conf, path);
pw_log_info("%p: loading config '%s'", user_data, path);
if (fstat(fd, &sbuf) < 0)
goto error_close;
if ((data = mmap(NULL, sbuf.st_size, PROT_READ, MAP_PRIVATE, fd, 0)) == MAP_FAILED)
goto error_close;
close(fd);
pw_properties_update_string(conf, data, sbuf.st_size);
munmap(data, sbuf.st_size);
spa_json_init(&it[0], data, sbuf.st_size);
if (spa_json_enter_object(&it[0], &it[1]) <= 0)
spa_json_init(&it[1], data, sbuf.st_size);
pw_properties_set(conf, "config.path", path);
pw_properties_set(conf, "config.prefix", prefix);
pw_properties_set(conf, "config.name", name);
while (spa_json_get_string(&it[1], key, sizeof(key)) > 0) {
if ((len = spa_json_next(&it[1], &val)) <= 0)
break;
if (section && !spa_streq(key, section))
continue;
if (spa_json_is_null(val, len))
val = NULL;
else if (spa_json_is_container(val, len))
len = spa_json_container_len(&it[1], val, len);
if ((res = callback(user_data, path, key, val, len)) != 0)
return res;
}
munmap(data, sbuf.st_size);
return 0;
@ -384,6 +402,20 @@ error_close:
return -errno;
}
static int update_conf(void *user_data, const char *location, const char *key,
const char *val, size_t len)
{
struct pw_properties *conf = user_data;
char *v = NULL;
if (val != NULL && (v = malloc(len+1)) != NULL)
spa_json_parse_stringn(val, len, v, len+1);
pw_properties_set(conf, key, v);
free(v);
return 0;
}
SPA_EXPORT
int pw_conf_load_conf(const char *prefix, const char *name, struct pw_properties *conf)
{
@ -398,7 +430,11 @@ int pw_conf_load_conf(const char *prefix, const char *name, struct pw_properties
pw_log_debug("%p: can't load config '%s': %m", conf, path);
return -ENOENT;
}
return conf_load(path, prefix, name, conf);
pw_properties_set(conf, "config.path", path);
pw_properties_set(conf, "config.prefix", prefix);
pw_properties_set(conf, "config.name", name);
return conf_for_each(path, NULL, update_conf, conf);
}
SPA_EXPORT
@ -415,7 +451,7 @@ int pw_conf_load_state(const char *prefix, const char *name, struct pw_propertie
pw_log_debug("%p: can't load config '%s': %m", conf, path);
return -ENOENT;
}
return conf_load(path, prefix, name, conf);
return conf_for_each(path, NULL, update_conf, conf);
}
struct data {

7
src/pipewire/context.h
View file

@ -108,12 +108,13 @@ const struct pw_properties *pw_context_get_properties(struct pw_context *context
/** Update the context properties */
int pw_context_update_properties(struct pw_context *context, const struct spa_dict *dict);
/** Get a config section for this context. Since 0.3.22 */
/** Get a config section for this context. Since 0.3.22, deprecated,
* use pw_context_conf_section_for_each() */
const char *pw_context_get_conf_section(struct pw_context *context, const char *section);
/** Parse a config section for this context. Since 0.3.22 */
/** Parse a standard config section for this context. Since 0.3.22 */
int pw_context_parse_conf_section(struct pw_context *context,
struct pw_properties *conf, const char *section);
/** update properties from section into props. Since 0.3.45 */
int pw_context_conf_update_props(struct pw_context *context, const char *section,
struct pw_properties *props);