mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-01 22:58:50 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

context: fall back to loading the configured PIPEWIRE_CONF_NAME

Browse source 
First try to load the PIPEWIRE_CONF_NAME environment file, then
fall back to the application configured value (instead of client.conf)
and then fall back to client.conf.
This commit is contained in:
Wim Taymans 2021-04-13 18:40:06 +02:00
parent 99eeec5854
commit d8e3f9b801
1 changed files with 33 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

60
src/pipewire/context.c
View file

@ -161,6 +161,25 @@ static void fill_defaults(struct pw_context *this)
this->defaults.clock_min_quantum, this->defaults.clock_max_quantum); this->defaults.clock_min_quantum, this->defaults.clock_max_quantum);
} }
static int try_load_conf(struct pw_context *this, const char *conf_prefix,
const char *conf_name, struct pw_properties *conf)
{
int res;
if (conf_name == NULL)
return -EINVAL;
if (strcmp(conf_name, "null") == 0)
return 0;
if ((res = pw_conf_load_conf(conf_prefix, conf_name, conf)) < 0) {
pw_log_warn(NAME" %p: can't load config %s%s%s: %s",
this,
conf_prefix ? conf_prefix : "",
conf_prefix ? "/" : "",
conf_name, spa_strerror(res));
}
return res;
}
/** Create a new context object /** Create a new context object
* *
* \param main_loop the main loop to use * \param main_loop the main loop to use
@ -203,39 +222,26 @@ struct pw_context *pw_context_new(struct pw_loop *main_loop,
goto error_free; goto error_free;
} }
conf_prefix = getenv("PIPEWIRE_CONFIG_PREFIX");
if (conf_prefix == NULL)
conf_prefix = pw_properties_get(properties, PW_KEY_CONFIG_PREFIX);
conf_name = getenv("PIPEWIRE_CONFIG_NAME");
if (conf_name == NULL)
conf_name = pw_properties_get(properties, PW_KEY_CONFIG_NAME);
if (conf_name == NULL)
conf_name = "client.conf";
conf = pw_properties_new(NULL, NULL); conf = pw_properties_new(NULL, NULL);
if (conf == NULL) { if (conf == NULL) {
res = -errno; res = -errno;
goto error_free; goto error_free;
} }
if (strcmp(conf_name, "null") != 0 &&
(res = pw_conf_load_conf(conf_prefix, conf_name, conf)) < 0) { conf_prefix = getenv("PIPEWIRE_CONFIG_PREFIX");
if (conf_prefix == NULL && strcmp(conf_name, "client.conf") == 0) { if (conf_prefix == NULL)
pw_log_error(NAME" %p: can't load config %s: %s", conf_prefix = pw_properties_get(properties, PW_KEY_CONFIG_PREFIX);
conf_name = getenv("PIPEWIRE_CONFIG_NAME");
if (try_load_conf(this, conf_prefix, conf_name, conf) < 0) {
conf_name = pw_properties_get(properties, PW_KEY_CONFIG_NAME);
if (try_load_conf(this, conf_prefix, conf_name, conf) < 0) {
conf_name = "client.conf";
if (try_load_conf(this, conf_prefix, conf_name, conf) < 0) {
pw_log_error(NAME" %p: can't load config %s: %s",
this, conf_name, spa_strerror(res)); this, conf_name, spa_strerror(res));
goto error_free; goto error_free;
} else { }
pw_log_warn(NAME" %p: can't load config %s%s%s: %s. Using client.conf fallback",
this,
conf_prefix ? conf_prefix : "",
conf_prefix ? "/" : "",
conf_name, spa_strerror(res));
}
conf_prefix = NULL;
if ((res = pw_conf_load_conf(NULL, "client.conf", conf)) < 0) {
pw_log_error(NAME" %p: can't load client.conf config: %s",
this, spa_strerror(res));
goto error_free;
} }
} }
this->conf = conf; this->conf = conf;