commit 7e8a656722b3b19d499ad89c9c1e46b8be3da896
author Simon Wilson <simonwilson@google.com> Fri Jun 28 16:47:16 2013 -0700
committer Simon Wilson <simonwilson@google.com> Fri Jun 28 16:47:19 2013 -0700
tree bfe28387934c5cbfa3f636f8115a6561878334bc
parent 8813fe8c9c7bfe5722932166d379bc79e9dedf1d

Update to latest tinyalsa

ec28139 mixer: add mixer_get_name() API
710df88 mixer: add mixer_ctl_update() API

Change-Id: I0cabe7e673a53f4358b5dbae4a17112eff5a2848

mixer.c

diff --git a/mixer.c b/mixer.c
index 7419d3f..4568cca 100644
--- a/mixer.c
+++ b/mixer.c
@@ -52,7 +52,8 @@
 
 struct mixer {
     int fd;
-    struct snd_ctl_elem_info *info;
+    struct snd_ctl_card_info card_info;
+    struct snd_ctl_elem_info *elem_info;
     struct mixer_ctl *ctl;
     unsigned int count;
 };
@@ -79,8 +80,8 @@
         free(mixer->ctl);
     }
 
-    if (mixer->info)
-        free(mixer->info);
+    if (mixer->elem_info)
+        free(mixer->elem_info);
 
     free(mixer);
 
@@ -111,8 +112,11 @@
         goto fail;
 
     mixer->ctl = calloc(elist.count, sizeof(struct mixer_ctl));
-    mixer->info = calloc(elist.count, sizeof(struct snd_ctl_elem_info));
-    if (!mixer->ctl || !mixer->info)
+    mixer->elem_info = calloc(elist.count, sizeof(struct snd_ctl_elem_info));
+    if (!mixer->ctl || !mixer->elem_info)
+        goto fail;
+
+    if (ioctl(fd, SNDRV_CTL_IOCTL_CARD_INFO, &mixer->card_info) < 0)
         goto fail;
 
     eid = calloc(elist.count, sizeof(struct snd_ctl_elem_id));
@@ -127,7 +131,7 @@
         goto fail;
 
     for (n = 0; n < mixer->count; n++) {
-        struct snd_ctl_elem_info *ei = mixer->info + n;
+        struct snd_ctl_elem_info *ei = mixer->elem_info + n;
         ei->id.numid = eid[n].numid;
         if (ioctl(fd, SNDRV_CTL_IOCTL_ELEM_INFO, ei) < 0)
             goto fail;
@@ -165,6 +169,11 @@
     return 0;
 }
 
+const char *mixer_get_name(struct mixer *mixer)
+{
+    return (const char *)mixer->card_info.name;
+}
+
 unsigned int mixer_get_num_ctls(struct mixer *mixer)
 {
     if (!mixer)
@@ -189,12 +198,17 @@
         return NULL;
 
     for (n = 0; n < mixer->count; n++)
-        if (!strcmp(name, (char*) mixer->info[n].id.name))
+        if (!strcmp(name, (char*) mixer->elem_info[n].id.name))
             return mixer->ctl + n;
 
     return NULL;
 }
 
+void mixer_ctl_update(struct mixer_ctl *ctl)
+{
+    ioctl(ctl->mixer->fd, SNDRV_CTL_IOCTL_ELEM_INFO, ctl->info);
+}
+
 const char *mixer_ctl_get_name(struct mixer_ctl *ctl)
 {
     if (!ctl)