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: add some properties in the conf

Browse source 
Add the path, prefix and name in the config properties.
This commit is contained in:
Wim Taymans 2022-02-01 15:55:17 +01:00
parent 2b569861b1
commit 50de4b1886
1 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/pipewire/conf.c
View file

@ -350,7 +350,8 @@ error:
return res; return res;
} }
static int conf_load(const char *path, struct pw_properties *conf) static int conf_load(const char *path, const char *prefix, const char *name,
struct pw_properties *conf)
{ {
char *data; char *data;
struct stat sbuf; struct stat sbuf;
@ -371,6 +372,10 @@ static int conf_load(const char *path, struct pw_properties *conf)
pw_properties_update_string(conf, data, sbuf.st_size); pw_properties_update_string(conf, data, sbuf.st_size);
munmap(data, sbuf.st_size); munmap(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);
return 0; return 0;
error_close: error_close:
@ -392,8 +397,7 @@ 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); pw_log_debug("%p: can't load config '%s': %m", conf, path);
return -ENOENT; return -ENOENT;
} }
return conf_load(path, prefix, name, conf);
return conf_load(path, conf);
} }
SPA_EXPORT SPA_EXPORT
@ -410,8 +414,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); pw_log_debug("%p: can't load config '%s': %m", conf, path);
return -ENOENT; return -ENOENT;
} }
return conf_load(path, prefix, name, conf);
return conf_load(path, conf);
} }
/* context.spa-libs = { /* context.spa-libs = {