mixer: Add get_card_name() API

[android-sdk/platform-external-tinyalsa.git] / tinymix.c

diff --git a/tinymix.c b/tinymix.c
index 6427a02dbccb671799c0cb233938c6a49e028ec6..afc2fee0f19ef1f88a6297ce549abccd19df6232 100644 (file)
--- a/tinymix.c
+++ b/tinymix.c
@@ -30,12 +30,13 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
+#include <string.h>
 
 static void tinymix_list_controls(struct mixer *mixer);
-static void tinymix_detail_control(struct mixer *mixer, unsigned int id,
+static void tinymix_detail_control(struct mixer *mixer, const char *control,
                                    int print_all);
-static void tinymix_set_value(struct mixer *mixer, unsigned int id,
-                              char *value);
+static void tinymix_set_value(struct mixer *mixer, const char *control,
+                              char **values, unsigned int num_values);
 static void tinymix_print_enum(struct mixer_ctl *ctl, int print_all);
 
 int main(int argc, char **argv)
@@ -60,14 +61,17 @@ int main(int argc, char **argv)
         return EXIT_FAILURE;
     }
 
-    if (argc == 1)
+
+    if (argc == 1) {
+        printf("Mixer name: '%s'\n", mixer_get_name(mixer));
         tinymix_list_controls(mixer);
-    else if (argc == 2)
-        tinymix_detail_control(mixer, atoi(argv[1]), 1);
-    else if (argc == 3)
-        tinymix_set_value(mixer, atoi(argv[1]), argv[2]);
-    else
+    } else if (argc == 2) {
+        tinymix_detail_control(mixer, argv[1], 1);
+    } else if (argc >= 3) {
+        tinymix_set_value(mixer, argv[1], &argv[2], argc - 2);
+    } else {
         printf("Usage: tinymix [-D card] [control id] [value to set]\n");
+    }
 
     mixer_close(mixer);
 
@@ -93,7 +97,7 @@ static void tinymix_list_controls(struct mixer *mixer)
         type = mixer_ctl_get_type_string(ctl);
         num_values = mixer_ctl_get_num_values(ctl);
         printf("%d\t%s\t%d\t%-40s", i, type, num_values, name);
-        tinymix_detail_control(mixer, i, 0);
+        tinymix_detail_control(mixer, name, 0);
     }
 }
 
@@ -115,7 +119,7 @@ static void tinymix_print_enum(struct mixer_ctl *ctl, int print_all)
     }
 }
 
-static void tinymix_detail_control(struct mixer *mixer, unsigned int id,
+static void tinymix_detail_control(struct mixer *mixer, const char *control,
                                    int print_all)
 {
     struct mixer_ctl *ctl;
@@ -124,13 +128,16 @@ static void tinymix_detail_control(struct mixer *mixer, unsigned int id,
     unsigned int i;
     int min, max;
 
-    if (id >= mixer_get_num_ctls(mixer)) {
+    if (isdigit(control[0]))
+        ctl = mixer_get_ctl(mixer, atoi(control));
+    else
+        ctl = mixer_get_ctl_by_name(mixer, control);
+
+    if (!ctl) {
         fprintf(stderr, "Invalid mixer control\n");
         return;
     }
 
-    ctl = mixer_get_ctl(mixer, id);
-
     type = mixer_ctl_get_type(ctl);
     num_values = mixer_ctl_get_num_values(ctl);
 
@@ -168,30 +175,60 @@ static void tinymix_detail_control(struct mixer *mixer, unsigned int id,
     printf("\n");
 }
 
-static void tinymix_set_value(struct mixer *mixer, unsigned int id,
-                              char *string)
+static void tinymix_set_value(struct mixer *mixer, const char *control,
+                              char **values, unsigned int num_values)
 {
     struct mixer_ctl *ctl;
     enum mixer_ctl_type type;
-    unsigned int num_values;
+    unsigned int num_ctl_values;
     unsigned int i;
 
-    ctl = mixer_get_ctl(mixer, id);
-    type = mixer_ctl_get_type(ctl);
-    num_values = mixer_ctl_get_num_values(ctl);
+    if (isdigit(control[0]))
+        ctl = mixer_get_ctl(mixer, atoi(control));
+    else
+        ctl = mixer_get_ctl_by_name(mixer, control);
 
-    if (isdigit(string[0])) {
-        int value = atoi(string);
+    if (!ctl) {
+        fprintf(stderr, "Invalid mixer control\n");
+        return;
+    }
 
-        for (i = 0; i < num_values; i++) {
-            if (mixer_ctl_set_value(ctl, i, value)) {
-                fprintf(stderr, "Error: invalid value\n");
+    type = mixer_ctl_get_type(ctl);
+    num_ctl_values = mixer_ctl_get_num_values(ctl);
+
+    if (isdigit(values[0][0])) {
+        if (num_values == 1) {
+            /* Set all values the same */
+            int value = atoi(values[0]);
+
+            for (i = 0; i < num_ctl_values; i++) {
+                if (mixer_ctl_set_value(ctl, i, value)) {
+                    fprintf(stderr, "Error: invalid value\n");
+                    return;
+                }
+            }
+        } else {
+            /* Set multiple values */
+            if (num_values > num_ctl_values) {
+                fprintf(stderr,
+                        "Error: %d values given, but control only takes %d\n",
+                        num_values, num_ctl_values);
                 return;
             }
+            for (i = 0; i < num_values; i++) {
+                if (mixer_ctl_set_value(ctl, i, atoi(values[i]))) {
+                    fprintf(stderr, "Error: invalid value for index %d\n", i);
+                    return;
+                }
+            }
         }
     } else {
         if (type == MIXER_CTL_TYPE_ENUM) {
-            if (mixer_ctl_set_enum_by_string(ctl, string))
+            if (num_values != 1) {
+                fprintf(stderr, "Enclose strings in quotes and try again\n");
+                return;
+            }
+            if (mixer_ctl_set_enum_by_string(ctl, values[0]))
                 fprintf(stderr, "Error: invalid enum value\n");
         } else {
             fprintf(stderr, "Error: only enum types can be set with strings\n");