diff options
| author | Clemens Ladisch <clemens@ladisch.de> | 2008-06-06 09:02:55 +0200 |
|---|---|---|
| committer | Clemens Ladisch <clemens@ladisch.de> | 2008-06-06 09:02:55 +0200 |
| commit | 8fc2c39dc81f1112a669ca1ad9985d9c0bc92d75 (patch) | |
| tree | ee4609cf9093330170c3899e6a8907f23ad4efaa /alsactl/state.c | |
| parent | 71f78e3f0c405b858857d4397e6bf3ec3beb8cda (diff) | |
| download | alsa-utils-8fc2c39dc81f1112a669ca1ad9985d9c0bc92d75.tar.gz | |
alsactl: simplify and fix item type detection
Use snd_ctl_elem_type_name() to detect the value of the type comment
instead of using hardcoded strings.
The types list now also includes the BYTES type (Debian bug 481515).
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Diffstat (limited to 'alsactl/state.c')
| -rw-r--r-- | alsactl/state.c | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/alsactl/state.c b/alsactl/state.c index 70fa4a5..6c7f853 100644 --- a/alsactl/state.c +++ b/alsactl/state.c @@ -31,6 +31,9 @@ #include "alsactl.h" +#define ARRAY_SIZE(a) (sizeof (a) / sizeof (a)[0]) + + char *id_str(snd_ctl_elem_id_t *id) { static char str[128]; @@ -799,22 +802,23 @@ static int is_user_control(snd_config_t *conf) */ static int get_comment_type(snd_config_t *n) { + static const snd_ctl_elem_type_t types[] = { + SND_CTL_ELEM_TYPE_BOOLEAN, + SND_CTL_ELEM_TYPE_INTEGER, + SND_CTL_ELEM_TYPE_ENUMERATED, + SND_CTL_ELEM_TYPE_BYTES, + SND_CTL_ELEM_TYPE_IEC958, + SND_CTL_ELEM_TYPE_INTEGER64, + }; const char *type; + unsigned int i; if (snd_config_get_string(n, &type) < 0) return -EINVAL; - if (strcmp(type, "BOOLEAN") == 0) - return SND_CTL_ELEM_TYPE_BOOLEAN; - else if (strcmp(type, "INTEGER") == 0) - return SND_CTL_ELEM_TYPE_INTEGER; - else if (strcmp(type, "ENUMERATED") == 0) - return SND_CTL_ELEM_TYPE_ENUMERATED; - else if (strcmp(type, "INTEGER64") == 0) - return SND_CTL_ELEM_TYPE_INTEGER; - else if (strcmp(type, "IEC958") == 0) - return SND_CTL_ELEM_TYPE_IEC958; - else - return -EINVAL; + for (i = 0; i < ARRAY_SIZE(types); ++i) + if (strcmp(type, snd_ctl_elem_type_name(types[i])) == 0) + return types[i]; + return -EINVAL; } /* |