mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2026-04-15 08:21:00 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

topology: rename OBJECT_TYPE_ to SND_TPLG_TYPE_

Browse source 
rename OBJECT_TYPE_ to SND_TPLG_TYPE_ in preparation for exporting via
a new public API.

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 2015-08-10 19:13:47 +01:00 • committed by Takashi Iwai
parent b47cf00197
commit 634712d21c
9 changed files with 118 additions and 115 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/topology/tplg_local.h
View file

@ -40,22 +40,22 @@
struct tplg_ref;
struct tplg_elem;
/* internal topology object type not used by kernel */
enum object_type {
OBJECT_TYPE_TLV = 0,
OBJECT_TYPE_MIXER,
OBJECT_TYPE_ENUM,
OBJECT_TYPE_TEXT,
OBJECT_TYPE_DATA,
OBJECT_TYPE_BYTES,
OBJECT_TYPE_STREAM_CONFIG,
OBJECT_TYPE_STREAM_CAPS,
OBJECT_TYPE_PCM,
OBJECT_TYPE_DAPM_WIDGET,
OBJECT_TYPE_DAPM_GRAPH,
OBJECT_TYPE_BE,
OBJECT_TYPE_CC,
OBJECT_TYPE_MANIFEST,
/** Topology object types */
enum snd_tplg_type {
SND_TPLG_TYPE_TLV = 0, /*!< TLV Data */
SND_TPLG_TYPE_MIXER, /*!< Mixer control*/
SND_TPLG_TYPE_ENUM, /*!< Enumerated control */
SND_TPLG_TYPE_TEXT, /*!< Text data */
SND_TPLG_TYPE_DATA, /*!< Private data */
SND_TPLG_TYPE_BYTES, /*!< Byte control */
SND_TPLG_TYPE_STREAM_CONFIG, /*!< PCM Stream configuration */
SND_TPLG_TYPE_STREAM_CAPS, /*!< PCM Stream capabilities */
SND_TPLG_TYPE_PCM, /*!< PCM stream device */
SND_TPLG_TYPE_DAPM_WIDGET, /*!< DAPM widget */
SND_TPLG_TYPE_DAPM_GRAPH, /*!< DAPM graph elements */
SND_TPLG_TYPE_BE, /*!< BE DAI link */
SND_TPLG_TYPE_CC, /*!< Hostless codec <-> codec link */
SND_TPLG_TYPE_MANIFEST, /*!< Topology manifest */
};
struct snd_tplg {
@ -114,7 +114,7 @@ struct tplg_elem {
char texts[SND_SOC_TPLG_NUM_TEXTS][SNDRV_CTL_ELEM_ID_NAME_MAXLEN];
int index;
enum object_type type;
enum snd_tplg_type type;
int size; /* total size of this object inc pdata and ref objects */
int compound_elem; /* dont write this element as individual elem */
@ -217,7 +217,7 @@ struct tplg_elem *tplg_elem_lookup(struct list_head *base,
const char* id,
unsigned int type);
struct tplg_elem* tplg_elem_new_common(snd_tplg_t *tplg,
snd_config_t *cfg, const char *name, enum object_type type);
snd_config_t *cfg, const char *name, enum snd_tplg_type type);
static inline void elem_copy_text(char *dest, const char *src, int len)
{