mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-06 13:30:01 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

media-session: store the config dir path in our object

Browse source 
The media session modules need to load config files through
sm_media_session_load_conf() and that must be the same config dir as our
main configuration file's directory.
This commit is contained in:
Peter Hutterer 2021-10-15 10:53:32 +10:00
parent 5cfdc2620c
commit 00bd3b5b59
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/media-session/media-session.c
View file

@ -130,6 +130,8 @@ struct sync {
struct impl { struct impl {
struct sm_media_session this; struct sm_media_session this;
const char *config_dir;
struct pw_properties *conf; struct pw_properties *conf;
struct pw_properties *modules; struct pw_properties *modules;
@ -2041,7 +2043,8 @@ int sm_media_session_remove_links(struct sm_media_session *sess,
int sm_media_session_load_conf(struct sm_media_session *sess, const char *name, int sm_media_session_load_conf(struct sm_media_session *sess, const char *name,
struct pw_properties *conf) struct pw_properties *conf)
{ {
return pw_conf_load_conf(SESSION_PREFIX, name, conf); struct impl *impl = SPA_CONTAINER_OF(sess, struct impl, this);
return pw_conf_load_conf(impl->config_dir, name, conf);
} }
int sm_media_session_load_state(struct sm_media_session *sess, int sm_media_session_load_state(struct sm_media_session *sess,
@ -2509,8 +2512,9 @@ int main(int argc, char *argv[])
} }
config_dir = getenv("MEDIA_SESSION_CONFIG_DIR"); config_dir = getenv("MEDIA_SESSION_CONFIG_DIR");
impl.config_dir = config_dir ? config_dir : SESSION_PREFIX;
impl.this.props = pw_properties_new( impl.this.props = pw_properties_new(
PW_KEY_CONFIG_PREFIX, config_dir ? config_dir : SESSION_PREFIX, PW_KEY_CONFIG_PREFIX, impl.config_dir,
PW_KEY_CONFIG_NAME, config_name, PW_KEY_CONFIG_NAME, config_name,
NULL); NULL);
if (impl.this.props == NULL) if (impl.this.props == NULL)
@ -2519,7 +2523,7 @@ int main(int argc, char *argv[])
if ((impl.conf = pw_properties_new(NULL, NULL)) == NULL) if ((impl.conf = pw_properties_new(NULL, NULL)) == NULL)
return 1; return 1;
pw_conf_load_conf(SESSION_PREFIX, config_name, impl.conf); pw_conf_load_conf(config_dir, config_name, impl.conf);
if ((str = pw_properties_get(impl.conf, "context.properties")) != NULL) if ((str = pw_properties_get(impl.conf, "context.properties")) != NULL)
pw_properties_update_string(impl.this.props, str, strlen(str)); pw_properties_update_string(impl.this.props, str, strlen(str));