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

topology: Store number of strings of a text section

Browse source 
Enum controls may use text elements and need the number of strings.

This patch adds a text child object for a generic element. When parsing
a text section from the configuation file, store the text strings and
number of strings (num_items) in the text child object of the element.

Reported-by: G Kranthi <gudishax.kranthikumar@intel.com>
Signed-off-by: Mengdong Lin <mengdong.lin@linux.intel.com>
Acked-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Mengdong Lin 2016-11-24 09:34:00 +08:00 • committed by Takashi Iwai
parent f9633ed852
commit f53ff68562
4 changed files with 14 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/topology/ctl.c
View file

@ -159,9 +159,11 @@ static void copy_enum_texts(struct tplg_elem *enum_elem,
struct tplg_elem *ref_elem)
{
struct snd_soc_tplg_enum_control *ec = enum_elem->enum_ctrl;
struct tplg_texts *texts = ref_elem->texts;
memcpy(ec->texts, ref_elem->texts,
memcpy(ec->texts, texts->items,
SND_SOC_TPLG_NUM_TEXTS * SNDRV_CTL_ELEM_ID_NAME_MAXLEN);
ec->items += texts->num_items;
}
/* check referenced text for a enum control */