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

topology: fix the ops parser (accept integer/hexa values)

Browse source 
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Jaroslav Kysela 2019-12-31 15:27:58 +01:00
parent 1482d1f254
commit c765615bce
1 changed files with 25 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/topology/ops.c
View file

@ -67,6 +67,7 @@ int tplg_parse_ops(snd_tplg_t *tplg ATTRIBUTE_UNUSED, snd_config_t *cfg,
snd_config_t *n; snd_config_t *n;
struct snd_soc_tplg_ctl_hdr *hdr = private; struct snd_soc_tplg_ctl_hdr *hdr = private;
const char *id, *value; const char *id, *value;
int ival;
tplg_dbg("\tOps\n"); tplg_dbg("\tOps\n");
hdr->size = sizeof(*hdr); hdr->size = sizeof(*hdr);
@ -80,17 +81,23 @@ int tplg_parse_ops(snd_tplg_t *tplg ATTRIBUTE_UNUSED, snd_config_t *cfg,
continue; continue;
/* get value - try strings then ints */ /* get value - try strings then ints */
if (snd_config_get_type(n) == SND_CONFIG_TYPE_STRING) {
if (snd_config_get_string(n, &value) < 0) if (snd_config_get_string(n, &value) < 0)
continue; continue;
ival = lookup_ops(value);
} else {
if (tplg_get_integer(n, &ival, 0))
continue;
}
if (strcmp(id, "info") == 0) if (strcmp(id, "info") == 0)
hdr->ops.info = lookup_ops(value); hdr->ops.info = ival;
else if (strcmp(id, "put") == 0) else if (strcmp(id, "put") == 0)
hdr->ops.put = lookup_ops(value); hdr->ops.put = ival;
else if (strcmp(id, "get") == 0) else if (strcmp(id, "get") == 0)
hdr->ops.get = lookup_ops(value); hdr->ops.get = ival;
tplg_dbg("\t\t%s = %s\n", id, value); tplg_dbg("\t\t%s = %d\n", id, ival);
} }
return 0; return 0;
@ -146,6 +153,7 @@ int tplg_parse_ext_ops(snd_tplg_t *tplg ATTRIBUTE_UNUSED,
snd_config_t *n; snd_config_t *n;
struct snd_soc_tplg_bytes_control *be = private; struct snd_soc_tplg_bytes_control *be = private;
const char *id, *value; const char *id, *value;
int ival;
tplg_dbg("\tExt Ops\n"); tplg_dbg("\tExt Ops\n");
@ -158,15 +166,21 @@ int tplg_parse_ext_ops(snd_tplg_t *tplg ATTRIBUTE_UNUSED,
continue; continue;
/* get value - try strings then ints */ /* get value - try strings then ints */
if (snd_config_get_type(n) == SND_CONFIG_TYPE_STRING) {
if (snd_config_get_string(n, &value) < 0) if (snd_config_get_string(n, &value) < 0)
continue; continue;
ival = lookup_ops(value);
} else {
if (tplg_get_integer(n, &ival, 0))
continue;
}
if (strcmp(id, "info") == 0) if (strcmp(id, "info") == 0)
be->ext_ops.info = lookup_ops(value); be->ext_ops.info = ival;
else if (strcmp(id, "put") == 0) else if (strcmp(id, "put") == 0)
be->ext_ops.put = lookup_ops(value); be->ext_ops.put = ival;
else if (strcmp(id, "get") == 0) else if (strcmp(id, "get") == 0)
be->ext_ops.get = lookup_ops(value); be->ext_ops.get = ival;
tplg_dbg("\t\t%s = %s\n", id, value); tplg_dbg("\t\t%s = %s\n", id, value);
} }