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

Fix compilation

Browse source 
Fix compilation: the code was based on the developing version of alsa-lib...
This commit is contained in:
Takashi Iwai 2005-01-03 13:32:34 +00:00
parent bc70fd0429
commit 990153e3a4
1 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
alsactl/alsactl.c
View file

@ -690,6 +690,7 @@ static int is_user_control(snd_config_t *conf)
static int add_user_control(snd_ctl_t *handle, snd_ctl_elem_info_t *info, snd_config_t *conf) static int add_user_control(snd_ctl_t *handle, snd_ctl_elem_info_t *info, snd_config_t *conf)
{ {
snd_ctl_elem_id_t *id;
snd_config_iterator_t i, next; snd_config_iterator_t i, next;
long imin, imax, istep; long imin, imax, istep;
snd_ctl_elem_type_t ctype; snd_ctl_elem_type_t ctype;
@ -745,19 +746,21 @@ static int add_user_control(snd_ctl_t *handle, snd_ctl_elem_info_t *info, snd_co
} }
} }
snd_ctl_elem_id_alloca(&id);
snd_ctl_elem_info_get_id(info, id);
if (count <= 0) if (count <= 0)
count = 1; count = 1;
switch (ctype) { switch (ctype) {
case SND_CTL_ELEM_TYPE_INTEGER: case SND_CTL_ELEM_TYPE_INTEGER:
if (imin > imax || istep > imax - imin) if (imin > imax || istep > imax - imin)
return -EINVAL; return -EINVAL;
err = snd_ctl_elem_add_integer(handle, info, count, imin, imax, istep); err = snd_ctl_elem_add_integer(handle, id, count, imin, imax, istep);
break; break;
case SND_CTL_ELEM_TYPE_BOOLEAN: case SND_CTL_ELEM_TYPE_BOOLEAN:
err = snd_ctl_elem_add_boolean(handle, info, count); err = snd_ctl_elem_add_boolean(handle, id, count);
break; break;
case SND_CTL_ELEM_TYPE_IEC958: case SND_CTL_ELEM_TYPE_IEC958:
err = snd_ctl_elem_add_iec958(handle, info); err = snd_ctl_elem_add_iec958(handle, id);
break; break;
default: default:
err = -EINVAL; err = -EINVAL;
@ -927,6 +930,14 @@ static int set_control(snd_ctl_t *handle, snd_config_t *control)
error("warning: name mismatch (%s/%s) for control #%d", name, name1, numid); error("warning: name mismatch (%s/%s) for control #%d", name, name1, numid);
if (index != index1) if (index != index1)
error("warning: index mismatch (%ld/%ld) for control #%d", index, index1, numid); error("warning: index mismatch (%ld/%ld) for control #%d", index, index1, numid);
#if 0
if (comment) {
check_comment_type(comment, type);
if (type == SND_CTL_ELEM_TYPE_INTEGER ||
type == SND_CTL_ELEM_TYPE_INTEGER64)
check_comment_range(comment, info);
}
#endif
if (!snd_ctl_elem_info_is_writable(info)) if (!snd_ctl_elem_info_is_writable(info))
return 0; return 0;