mirror of
https://github.com/alsa-project/alsa-lib.git
synced 2025-10-31 22:25:35 -04:00
ucm: parse LibraryConfig also in the toplevel file
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
parent
ffb401ba22
commit
d9658b7509
1 changed files with 12 additions and 2 deletions
|
|
@ -2098,7 +2098,7 @@ static int parse_master_file(snd_use_case_mgr_t *uc_mgr, snd_config_t *cfg)
|
||||||
if (strcmp(id, "Error") == 0)
|
if (strcmp(id, "Error") == 0)
|
||||||
return error_node(uc_mgr, n);
|
return error_node(uc_mgr, n);
|
||||||
|
|
||||||
uc_error("uknown master file field %s", id);
|
uc_error("unknown master file field %s", id);
|
||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
@ -2337,7 +2337,17 @@ static int parse_toplevel_config(snd_use_case_mgr_t *uc_mgr,
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
uc_error("uknown toplevel field %s", id);
|
/* alsa-lib configuration */
|
||||||
|
if (uc_mgr->conf_format > 3 && strcmp(id, "LibraryConfig") == 0) {
|
||||||
|
err = parse_libconfig(uc_mgr, n);
|
||||||
|
if (err < 0) {
|
||||||
|
uc_error("error: failed to parse LibConfig");
|
||||||
|
return err;
|
||||||
|
}
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
uc_error("unknown toplevel field %s", id);
|
||||||
}
|
}
|
||||||
|
|
||||||
return -ENOENT;
|
return -ENOENT;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue