mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-11-04 13:30:08 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

ucm: switch to ucm2 directory and v2 format, keep backward compatibility

Browse source 
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Jaroslav Kysela 2019-11-09 11:53:32 +01:00
parent f600310954
commit aba2260ae7
3 changed files with 134 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/ucm/utils.c
View file

@ -49,7 +49,7 @@ void uc_mgr_stdout(const char *fmt,...)
va_end(va);
}
int uc_mgr_config_load(const char *file, snd_config_t **cfg)
int uc_mgr_config_load(int format, const char *file, snd_config_t **cfg)
{
FILE *fp;
snd_input_t *in;
@ -71,9 +71,15 @@ int uc_mgr_config_load(const char *file, snd_config_t **cfg)
if (err < 0)
goto __err1;
path = getenv(ALSA_CONFIG_UCM_VAR);
if (!path || path[0] == '\0')
path = ALSA_CONFIG_DIR "/ucm";
if (format >= 2) {
path = getenv(ALSA_CONFIG_UCM2_VAR);
if (!path || path[0] == '\0')
path = ALSA_CONFIG_DIR "/ucm2";
} else {
path = getenv(ALSA_CONFIG_UCM_VAR);
if (!path || path[0] == '\0')
path = ALSA_CONFIG_DIR "/ucm";
}
default_paths[0] = path;
default_paths[1] = NULL;