mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-03 09:01:54 -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

78
spa/plugins/alsa/acp/compat.c
View file

@ -18,9 +18,13 @@
along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
***/
#include <spa/utils/string.h>
#include <spa/utils/cleanup.h>
#include "compat.h"
#include "device-port.h"
#include "alsa-mixer.h"
#include "config.h"
static const char *port_types[] = {
[PA_DEVICE_PORT_TYPE_UNKNOWN] = "unknown",
@ -208,3 +212,77 @@ bool pa_alsa_device_init_description(pa_proplist *p, pa_card *card) {
return true;
}
static char *try_path(const char *fname, const char *path)
{
char *result = pa_maybe_prefix_path(fname, path);
pa_log_trace("Check for file: %s", result);
if (access(result, R_OK) == 0)
return result;
pa_xfree(result);
return NULL;
}
static char *get_xdg_home(const char *key, const char *fallback)
{
const char *e;
e = getenv(key);
if (e && *e) {
return strdup(e);
} else {
e = getenv("HOME");
if (!(e && *e))
e = getenv("USERPROFILE");
if (e && *e)
return spa_aprintf("%s/%s", e, fallback);
}
return NULL;
}
char *get_data_path(const char *data_dir, const char *data_type, const char *fname)
{
static const char * const subpaths[] = {
"alsa-card-profile/mixer",
"alsa-card-profile",
};
const char *e;
spa_autofree char *base = NULL;
spa_autofree char *path = NULL;
char *result;
if (data_dir)
if ((result = try_path(fname, data_dir)) != NULL)
return result;
e = getenv("ACP_PATHS_DIR");
if (e && *e && spa_streq(data_type, "paths"))
if ((result = try_path(fname, e)) != NULL)
return result;
e = getenv("ACP_PROFILES_DIR");
if (e && *e && spa_streq(data_type, "profile-sets"))
if ((result = try_path(fname, e)) != NULL)
return result;
base = get_xdg_home("XDG_CONFIG_HOME", ".config");
if (base) {
SPA_FOR_EACH_ELEMENT_VAR(subpaths, subpath) {
path = spa_aprintf("%s/%s/%s", base, *subpath, data_type);
if ((result = try_path(fname, path)) != NULL)
return result;
}
}
SPA_FOR_EACH_ELEMENT_VAR(subpaths, subpath) {
path = spa_aprintf("/etc/%s/%s", *subpath, data_type);
if ((result = try_path(fname, path)) != NULL)
return result;
}
path = spa_aprintf("%s/%s", PA_ALSA_DATA_DIR, data_type);
return pa_maybe_prefix_path(fname, path);
}