summaryrefslogtreecommitdiff
path: root/modules/mixer/simple/sbase.h
diff options
context:
space:
mode:
authorJaroslav Kysela <perex@perex.cz>2009-05-12 08:05:50 +0200
committerJaroslav Kysela <perex@perex.cz>2009-05-15 14:18:15 +0200
commitecd6846c88d24f2a03895115b8ebf50679af69f3 (patch)
tree6880963798e200e7dcc3ef962e0149434bf709b1 /modules/mixer/simple/sbase.h
parent3e30007a19a0904ad7c8965b0883322639e52b82 (diff)
downloadalsa-lib-ecd6846c88d24f2a03895115b8ebf50679af69f3.tar.gz
Initial amixer implementation + ctl & hctl API mergingamixer
This patch adds new mixer API which simplifies the previous mixer API (removed mixer class). The control and hcontrol APIs were merged into one. Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Diffstat (limited to 'modules/mixer/simple/sbase.h')
-rw-r--r--modules/mixer/simple/sbase.h27
1 files changed, 13 insertions, 14 deletions
diff --git a/modules/mixer/simple/sbase.h b/modules/mixer/simple/sbase.h
index ee5fe03c..7feedc58 100644
--- a/modules/mixer/simple/sbase.h
+++ b/modules/mixer/simple/sbase.h
@@ -55,7 +55,7 @@ struct helem_selector {
struct helem_base {
struct list_head list;
- snd_hctl_elem_t *helem;
+ snd_ctl_elem_t *helem;
unsigned short purpose;
unsigned int caps;
unsigned int inactive: 1;
@@ -64,7 +64,6 @@ struct helem_base {
};
struct selem_base {
- sm_selem_t selem;
struct list_head helems;
unsigned short sid;
struct {
@@ -75,37 +74,37 @@ struct selem_base {
} dir[2];
};
-struct bclass_selector {
+struct bmixer_selector {
struct list_head list;
struct helem_selector *selectors;
unsigned int count;
};
-struct bclass_sid {
+struct bmixer_sid {
struct list_head list;
struct melem_sids *sids;
unsigned int count;
};
-typedef struct bclass_base_ops {
- int (*event)(snd_mixer_class_t *class, unsigned int mask,
- snd_hctl_elem_t *helem, snd_mixer_elem_t *melem);
- int (*selreg)(snd_mixer_class_t *class,
+typedef struct bmixer_base_ops {
+ int (*event)(snd_amixer_t *amixer, unsigned int mask,
+ snd_ctl_elem_t *helem, snd_amixer_elem_t *melem);
+ int (*selreg)(snd_amixer_t *amixer,
struct helem_selector *selectors,
unsigned int count);
- int (*sidreg)(snd_mixer_class_t *class,
+ int (*sidreg)(snd_amixer_t *amixer,
struct melem_sids *sids,
unsigned int count);
-} bclass_base_ops_t;
+} bmixer_base_ops_t;
-struct bclass_private {
+struct bmixer_private {
struct list_head selectors;
struct list_head sids;
void *dl_sbase;
- bclass_base_ops_t ops;
+ bmixer_base_ops_t ops;
};
-int mixer_simple_basic_dlopen(snd_mixer_class_t *class,
- bclass_base_ops_t **ops);
+int mixer_simple_basic_dlopen(snd_amixer_t *amixer,
+ bmixer_base_ops_t **ops);
#endif /* __SMIXER_BASE_H */