mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-11-01 22:58:49 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

ucm: list also hardware configs (hw:X) in uc_mgr_scan_master_configs() fcn

Browse source 
BugLink: https://github.com/alsa-project/alsa-ucm-conf/issues/168
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Jaroslav Kysela 2022-06-16 18:03:03 +02:00
parent 89ee619147
commit 2d56ff8ded
1 changed files with 58 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

71
src/ucm/parser.c
View file

@ -2880,13 +2880,27 @@ int uc_mgr_scan_master_configs(const char **_list[])
{ {
char filename[PATH_MAX], dfl[PATH_MAX], fn[FILENAME_MAX]; char filename[PATH_MAX], dfl[PATH_MAX], fn[FILENAME_MAX];
char *env = getenv(ALSA_CONFIG_UCM2_VAR); char *env = getenv(ALSA_CONFIG_UCM2_VAR);
snd_use_case_mgr_t *uc_mgr;
const char **list, *d_name; const char **list, *d_name;
char *s;
snd_config_t *cfg, *c; snd_config_t *cfg, *c;
int i, j, cnt, err; int i, j, cnt, err, cards;
long l; long l;
ssize_t ss; ssize_t ss;
struct dirent64 **namelist; struct dirent64 **namelist;
i = -1;
cards = 0;
while (1) {
err = snd_card_next(&i);
if (err < 0)
return err;
if (i < 0)
break;
cards++;
}
cards += 4; /* plug-and-play */
if (env) if (env)
snprintf(filename, sizeof(filename), "%s/conf.virt.d", env); snprintf(filename, sizeof(filename), "%s/conf.virt.d", env);
else else
@ -2921,13 +2935,46 @@ int uc_mgr_scan_master_configs(const char **_list[])
} }
} }
list = calloc(1, cnt * 2 * sizeof(char *)); j = 0;
list = calloc(1, (cards + cnt) * 2 * sizeof(char *));
if (list == NULL) { if (list == NULL) {
err = -ENOMEM; err = -ENOMEM;
goto __err; goto __err;
} }
for (i = j = 0; i < cnt; i++) { i = -1;
while (j / 2 < cards) {
err = snd_card_next(&i);
if (err < 0)
goto __err;
if (i < 0)
break;
snprintf(fn, sizeof(fn), "-hw:%d", i);
err = snd_use_case_mgr_open(&uc_mgr, fn);
if (err == -ENOENT || err == -ENXIO)
continue;
if (err < 0) {
uc_error("Unable to open '%s': %s", fn, snd_strerror(err));
goto __err;
}
err = snd_use_case_get(uc_mgr, "comment", (const char **)&s);
if (err < 0) {
err = snd_card_get_longname(i, &s);
if (err < 0)
goto __err;
}
snd_use_case_mgr_close(uc_mgr);
list[j] = strdup(fn + 1);
if (list[j] == NULL) {
free(s);
err = -ENOMEM;
goto __err;
}
list[j + 1] = s;
j += 2;
}
for (i = 0; i < cnt; i++) {
d_name = namelist[i]->d_name; d_name = namelist[i]->d_name;
@ -2984,23 +3031,21 @@ int uc_mgr_scan_master_configs(const char **_list[])
} }
j += 2; j += 2;
} }
err = j; err = 0;
__err: __err:
for (i = 0; i < cnt; i++) { for (i = 0; i < cnt; i++)
free(namelist[i]); free(namelist[i]);
if (err < 0) { free(namelist);
if (err < 0) {
for (i = 0; i < j; i++) {
free((void *)list[i * 2]); free((void *)list[i * 2]);
free((void *)list[i * 2 + 1]); free((void *)list[i * 2 + 1]);
} }
}
free(namelist);
if (err >= 0) {
*_list = list;
} else {
free(list); free(list);
return err;
} }
return err; *_list = list;
return j;
} }