OSDN Git Service
(root)
/
android-x86
/
external-alsa-lib.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
529154f
)
ucm: substitute device strings in the device lists
author
Jaroslav Kysela
<perex@perex.cz>
Wed, 27 May 2020 12:04:13 +0000
(14:04 +0200)
committer
Jaroslav Kysela
<perex@perex.cz>
Wed, 27 May 2020 12:04:13 +0000
(14:04 +0200)
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
src/ucm/parser.c
patch
|
blob
|
history
diff --git
a/src/ucm/parser.c
b/src/ucm/parser.c
index
506114c
..
e4b1b71
100644
(file)
--- a/
src/ucm/parser.c
+++ b/
src/ucm/parser.c
@@
-493,7
+493,11
@@
static int parse_device_list(snd_use_case_mgr_t *uc_mgr ATTRIBUTE_UNUSED,
sdev = calloc(1, sizeof(struct dev_list_node));
if (sdev == NULL)
return -ENOMEM;
- err = parse_string(n, &sdev->name);
+ if (uc_mgr->conf_format < 3) {
+ err = parse_string(n, &sdev->name);
+ } else {
+ err = parse_string_substitute(uc_mgr, n, &sdev->name);
+ }
if (err < 0) {
free(sdev);
return err;