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

topology: add support for pasring external ops in conf files

Browse source 
Parsing external ops was missing from the conf files but was in the
C API. Fix this now by making sure we also check for external ops.

Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Liam Girdwood 2016-03-14 08:07:36 +00:00 • committed by Takashi Iwai
parent 65cb4ffe3c
commit d1784ad804
3 changed files with 48 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/topology/ctl.c
View file

@ -393,6 +393,14 @@ int tplg_parse_control_bytes(snd_tplg_t *tplg,
return err;
continue;
}
if (strcmp(id, "extops") == 0) {
err = tplg_parse_compound(tplg, n, tplg_parse_ext_ops,
be);
if (err < 0)
return err;
continue;
}
}
return 0;

38
src/topology/ops.c
View file

@ -82,3 +82,41 @@ int tplg_parse_ops(snd_tplg_t *tplg ATTRIBUTE_UNUSED,
return 0;
}
/* Parse External Control operations. Ops can come from standard names above or
* bespoke driver controls with numbers >= 256
*/
int tplg_parse_ext_ops(snd_tplg_t *tplg ATTRIBUTE_UNUSED,
snd_config_t *cfg, void *private)
{
snd_config_iterator_t i, next;
snd_config_t *n;
struct snd_soc_tplg_bytes_control *be = private;
const char *id, *value;
tplg_dbg("\tExt Ops\n");
snd_config_for_each(i, next, cfg) {
n = snd_config_iterator_entry(i);
/* get id */
if (snd_config_get_id(n, &id) < 0)
continue;
/* get value - try strings then ints */
if (snd_config_get_string(n, &value) < 0)
continue;
if (strcmp(id, "info") == 0)
be->ext_ops.info = lookup_ops(value);
else if (strcmp(id, "put") == 0)
be->ext_ops.put = lookup_ops(value);
else if (strcmp(id, "get") == 0)
be->ext_ops.get = lookup_ops(value);
tplg_dbg("\t\t%s = %s\n", id, value);
}
return 0;
}

2
src/topology/tplg_local.h
View file

@ -206,6 +206,8 @@ int tplg_parse_channel(snd_tplg_t *tplg ATTRIBUTE_UNUSED,
int tplg_parse_ops(snd_tplg_t *tplg ATTRIBUTE_UNUSED,
snd_config_t *cfg, void *private);
int tplg_parse_ext_ops(snd_tplg_t *tplg ATTRIBUTE_UNUSED,
snd_config_t *cfg, void *private);
struct tplg_elem *lookup_pcm_dai_stream(struct list_head *base,
const char* id);