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

topology: Fix issue in parsing routes when generating topology binary

Browse source 
We missed parsing the index value, which is used as a use case indicator, when
processing the route objects.

This patch fixes the bug.

Signed-off-by: Fuwei Tang <fuweix.tang@intel.com>
Tested-by: Subhransu S. Prusty <subhransu.s.prusty@intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Fuwei Tang 2017-05-05 15:57:20 +08:00 • committed by Takashi Iwai
parent 516bf057b0
commit 88fd41aef4
1 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/topology/dapm.c
View file

@ -381,7 +381,7 @@ done:
} }
static int tplg_parse_routes(snd_tplg_t *tplg, snd_config_t *cfg) static int tplg_parse_routes(snd_tplg_t *tplg, snd_config_t *cfg, int index)
{ {
snd_config_iterator_t i, next; snd_config_iterator_t i, next;
snd_config_t *n; snd_config_t *n;
@ -399,7 +399,7 @@ static int tplg_parse_routes(snd_tplg_t *tplg, snd_config_t *cfg)
elem = tplg_elem_new_route(tplg); elem = tplg_elem_new_route(tplg);
if (!elem) if (!elem)
return -ENOMEM; return -ENOMEM;
elem->index = index;
line = elem->route; line = elem->route;
err = tplg_parse_line(val, line); err = tplg_parse_line(val, line);
@ -419,7 +419,8 @@ int tplg_parse_dapm_graph(snd_tplg_t *tplg, snd_config_t *cfg,
snd_config_iterator_t i, next; snd_config_iterator_t i, next;
snd_config_t *n; snd_config_t *n;
int err; int err;
const char *graph_id; const char *graph_id, *val = NULL;
int index;
if (snd_config_get_type(cfg) != SND_CONFIG_TYPE_COMPOUND) { if (snd_config_get_type(cfg) != SND_CONFIG_TYPE_COMPOUND) {
SNDERR("error: compound is expected for dapm graph definition\n"); SNDERR("error: compound is expected for dapm graph definition\n");
@ -436,8 +437,14 @@ int tplg_parse_dapm_graph(snd_tplg_t *tplg, snd_config_t *cfg,
continue; continue;
} }
if (strcmp(id, "index") == 0) {
if (snd_config_get_string(n, &val) < 0)
return -EINVAL;
index = atoi(val);
}
if (strcmp(id, "lines") == 0) { if (strcmp(id, "lines") == 0) {
err = tplg_parse_routes(tplg, n); err = tplg_parse_routes(tplg, n, index);
if (err < 0) { if (err < 0) {
SNDERR("error: failed to parse dapm graph %s\n", SNDERR("error: failed to parse dapm graph %s\n",
graph_id); graph_id);