mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2026-03-29 07:57:59 -04: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

9
src/topology/tplg_local.h
View file

@ -91,6 +91,11 @@ struct tplg_ref {
struct list_head list;
};
struct tplg_texts {
unsigned int num_items;
char items[SND_SOC_TPLG_NUM_TEXTS][SNDRV_CTL_ELEM_ID_NAME_MAXLEN];
};
/* element for vendor tokens */
struct tplg_token {
char id[SNDRV_CTL_ELEM_ID_NAME_MAXLEN];
@ -128,9 +133,6 @@ struct tplg_elem {
char id[SNDRV_CTL_ELEM_ID_NAME_MAXLEN];
/* storage for texts and data if this is text or data elem*/
char texts[SND_SOC_TPLG_NUM_TEXTS][SNDRV_CTL_ELEM_ID_NAME_MAXLEN];
int index;
enum snd_tplg_type type;
@ -155,6 +157,7 @@ struct tplg_elem {
/* these do not map to UAPI structs but are internal only */
struct snd_soc_tplg_ctl_tlv *tlv;
struct tplg_texts *texts;
struct snd_soc_tplg_private *data;
struct tplg_vendor_tokens *tokens;
struct tplg_vendor_tuples *tuples;