asgardius/alsa-utils
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-utils synced 2024-12-23 06:26:32 +01:00
Code Issues Projects Releases Packages Wiki Activity

alsactl: simplify and fix item type detection

Browse source 
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>
This commit is contained in:
Clemens Ladisch 2008-06-06 09:02:55 +02:00
parent 71f78e3f0c
commit 8fc2c39dc8
1 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
alsactl/state.c
View file

@ -31,6 +31,9 @@
#include "alsactl.h" #include "alsactl.h"
#define ARRAY_SIZE(a) (sizeof (a) / sizeof (a)[0])
char *id_str(snd_ctl_elem_id_t *id) char *id_str(snd_ctl_elem_id_t *id)
{ {
static char str[128]; 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 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; const char *type;
unsigned int i;
if (snd_config_get_string(n, &type) < 0) if (snd_config_get_string(n, &type) < 0)
return -EINVAL; return -EINVAL;
if (strcmp(type, "BOOLEAN") == 0) for (i = 0; i < ARRAY_SIZE(types); ++i)
return SND_CTL_ELEM_TYPE_BOOLEAN; if (strcmp(type, snd_ctl_elem_type_name(types[i])) == 0)
else if (strcmp(type, "INTEGER") == 0) return types[i];
return SND_CTL_ELEM_TYPE_INTEGER; return -EINVAL;
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;
} }
/* /*