mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-12-18 08:56:45 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

acp: Respect XDG base directory spec when loading configs

Browse source 
Backport from Pulseaudio. Reimplement get_data_path. We'll look for the
override files similarly as we do for other config files
(XDG_CONFIG_HOME then /etc then install location), instead of looking at
the Pulseaudio locations ~/.local/share/pulseaudio etc.

Upstream commits:

From: SimonP <simonp.git@gmail.com>

alsa-mixer: Respect XDG base directory spec when loading profile sets

Try $XDG_DATA_HOME, then $XDG_DATA_DIRS, and finally fall back to old behaviour.

From: SimonP <simonp.git@gmail.com>

alsa-mixer: Respect XDG base directory spec when loading path configs

Try $XDG_DATA_HOME, then $XDG_DATA_DIRS, and finally fall back to old
behaviour (prefix-defined directory).

core-util: Ignore non-absolute XDG base dirs

These are invalid per the spec.
This commit is contained in:
Pauli Virtanen 2023-11-08 21:22:42 +02:00 • committed by Wim Taymans
parent 3bbd1e66d2
commit 636a9c611d
4 changed files with 90 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

42
spa/plugins/alsa/acp/alsa-mixer.c
View file

@ -2795,20 +2795,6 @@ static int path_verify(pa_alsa_path *p) {
return 0;
}
static const char *get_default_paths_dir(void) {
const char *str;
#ifdef HAVE_RUNNING_FROM_BUILD_TREE
if (pa_run_from_build_tree())
return PA_SRCDIR "mixer/paths";
else
#endif
if (getenv("ACP_BUILDDIR") != NULL)
return "mixer/paths";
if ((str = getenv("ACP_PATHS_DIR")) != NULL)
return str;
return PA_ALSA_PATHS_DIR;
}
pa_alsa_path* pa_alsa_path_new(const char *paths_dir, const char *fname, pa_alsa_direction_t direction) {
pa_alsa_path *p;
char *fn;
@ -2873,10 +2859,9 @@ pa_alsa_path* pa_alsa_path_new(const char *paths_dir, const char *fname, pa_alsa
items[2].data = &p->description;
items[3].data = &mute_during_activation;
if (!paths_dir)
paths_dir = get_default_paths_dir();
fn = get_data_path(paths_dir, "paths", fname);
fn = pa_maybe_prefix_path(fname, paths_dir);
pa_log_info("Loading path config: %s", fn);
r = pa_config_parse(fn, NULL, items, p->proplist, false, p);
pa_xfree(fn);
@ -4827,20 +4812,6 @@ void pa_alsa_decibel_fix_dump(pa_alsa_decibel_fix *db_fix) {
pa_xfree(db_values);
}
static const char *get_default_profile_dir(void) {
const char *str;
#ifdef HAVE_RUNNING_FROM_BUILD_TREE
if (pa_run_from_build_tree())
return PA_SRCDIR "mixer/profile-sets";
else
#endif
if (getenv("ACP_BUILDDIR") != NULL)
return "mixer/profile-sets";
if ((str = getenv("ACP_PROFILES_DIR")) != NULL)
return str;
return PA_ALSA_PROFILE_SETS_DIR;
}
pa_alsa_profile_set* pa_alsa_profile_set_new(const char *fname, const pa_channel_map *bonus) {
pa_alsa_profile_set *ps;
pa_alsa_profile *p;
@ -4890,13 +4861,14 @@ pa_alsa_profile_set* pa_alsa_profile_set_new(const char *fname, const pa_channel
items[0].data = &ps->auto_profiles;
fn = pa_maybe_prefix_path(fname ? fname : "default.conf",
get_default_profile_dir());
fn = get_data_path(NULL, "profile-sets", fname ? fname : "default.conf");
pa_log_info("Loading profile set: %s", fn);
if ((r = access(fn, R_OK)) != 0) {
if (fname != NULL) {
pa_log_warn("profile-set '%s' can't be accessed: %m", fn);
fn = pa_maybe_prefix_path("default.conf",
get_default_profile_dir());
fn = get_data_path(NULL, "profile-sets", "default.conf");
r = access(fn, R_OK);
}
if (r != 0) {