mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-10-29 05:40:25 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Missing enum change

Browse source
This commit is contained in:
Abramo Bagnara 2001-02-05 16:04:15 +00:00
parent 5b0d5f0a49
commit ccb399f0cd
3 changed files with 21 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/control/control.c
View file

@ -80,7 +80,7 @@ int snd_ctl_cwrite(snd_ctl_t *ctl, snd_control_t *control)
return ctl->ops->cwrite(ctl, control); return ctl->ops->cwrite(ctl, control);
} }
int snd_ctl_hwdep_next_device(snd_ctl_t *ctl, int * device) int snd_ctl_hwdep_next_device(snd_ctl_t *ctl, int *device)
{ {
assert(ctl && device); assert(ctl && device);
return ctl->ops->hwdep_next_device(ctl, device); return ctl->ops->hwdep_next_device(ctl, device);

2
src/control/controls.c
View file

@ -214,7 +214,7 @@ int snd_ctl_hsort(const snd_hcontrol_t *c1, const snd_hcontrol_t *c2)
if (c1->id.iface > c2->id.iface) if (c1->id.iface > c2->id.iface)
return 1; return 1;
if ((res = strcmp(c1->id.name, c2->id.name)) != 0) { if ((res = strcmp(c1->id.name, c2->id.name)) != 0) {
if (c1->id.iface != SND_CONTROL_IFACE_MIXER) if (c1->id.iface != SNDRV_CONTROL_IFACE_MIXER)
return res; return res;
p1 = snd_ctl_hsort_mixer_priority(c1->id.name); p1 = snd_ctl_hsort_mixer_priority(c1->id.name);
p2 = snd_ctl_hsort_mixer_priority(c2->id.name); p2 = snd_ctl_hsort_mixer_priority(c2->id.name);

37
src/mixer/simple.c
View file

@ -45,7 +45,7 @@ static snd_hcontrol_t *test_mixer_id(snd_mixer_t *handle, const char *name, int
snd_hcontrol_t *hcontrol; snd_hcontrol_t *hcontrol;
memset(&id, 0, sizeof(id)); memset(&id, 0, sizeof(id));
id.iface = SND_CONTROL_IFACE_MIXER; id.iface = SNDRV_CONTROL_IFACE_MIXER;
strcpy(id.name, name); strcpy(id.name, name);
id.index = index; id.index = index;
hcontrol = snd_ctl_hfind(handle->ctl_handle, &id); hcontrol = snd_ctl_hfind(handle->ctl_handle, &id);
@ -56,7 +56,7 @@ static snd_hcontrol_t *test_mixer_id(snd_mixer_t *handle, const char *name, int
static int get_mixer_info(snd_mixer_t *handle, const char *name, int index, snd_control_info_t *info) static int get_mixer_info(snd_mixer_t *handle, const char *name, int index, snd_control_info_t *info)
{ {
memset(info, 0, sizeof(*info)); memset(info, 0, sizeof(*info));
info->id.iface = SND_CONTROL_IFACE_MIXER; info->id.iface = SNDRV_CONTROL_IFACE_MIXER;
strcpy(info->id.name, name); strcpy(info->id.name, name);
info->id.index = index; info->id.index = index;
return snd_ctl_cinfo(handle->ctl_handle, info); return snd_ctl_cinfo(handle->ctl_handle, info);
@ -65,7 +65,7 @@ static int get_mixer_info(snd_mixer_t *handle, const char *name, int index, snd_
static int get_mixer_read(snd_mixer_t *handle, const char *name, int index, snd_control_t *control) static int get_mixer_read(snd_mixer_t *handle, const char *name, int index, snd_control_t *control)
{ {
memset(control, 0, sizeof(*control)); memset(control, 0, sizeof(*control));
control->id.iface = SND_CONTROL_IFACE_MIXER; control->id.iface = SNDRV_CONTROL_IFACE_MIXER;
strcpy(control->id.name, name); strcpy(control->id.name, name);
control->id.index = index; control->id.index = index;
return snd_ctl_cread(handle->ctl_handle, control); return snd_ctl_cread(handle->ctl_handle, control);
@ -74,7 +74,7 @@ static int get_mixer_read(snd_mixer_t *handle, const char *name, int index, snd_
static int put_mixer_write(snd_mixer_t *handle, const char *name, int index, snd_control_t *control) static int put_mixer_write(snd_mixer_t *handle, const char *name, int index, snd_control_t *control)
{ {
control->id.numid = 0; control->id.numid = 0;
control->id.iface = SND_CONTROL_IFACE_MIXER; control->id.iface = SNDRV_CONTROL_IFACE_MIXER;
strcpy(control->id.name, name); strcpy(control->id.name, name);
control->id.device = control->id.subdevice = 0; control->id.device = control->id.subdevice = 0;
control->id.index = index; control->id.index = index;
@ -487,12 +487,13 @@ static int build_input(snd_mixer_t *handle, const char *sname)
if ((hcontrol = test_mixer_id(handle, sname, index)) != NULL) { if ((hcontrol = test_mixer_id(handle, sname, index)) != NULL) {
if ((err = get_mixer_info(handle, sname, index, &global_info)) < 0) if ((err = get_mixer_info(handle, sname, index, &global_info)) < 0)
return err; return err;
if (global_info.type == SND_CONTROL_TYPE_BOOLEAN || global_info.type == SND_CONTROL_TYPE_INTEGER) { if (global_info.type == SNDRV_CONTROL_TYPE_BOOLEAN ||
global_info.type == SNDRV_CONTROL_TYPE_INTEGER) {
if (voices < global_info.values_count) if (voices < global_info.values_count)
voices = global_info.values_count; voices = global_info.values_count;
caps |= global_info.type == SND_CONTROL_TYPE_BOOLEAN ? SND_MIXER_SCTCAP_MUTE : SND_MIXER_SCTCAP_VOLUME; caps |= global_info.type == SNDRV_CONTROL_TYPE_BOOLEAN ? SND_MIXER_SCTCAP_MUTE : SND_MIXER_SCTCAP_VOLUME;
present |= global_info.type == SND_CONTROL_TYPE_BOOLEAN ? MIXER_PRESENT_SINGLE_SWITCH : MIXER_PRESENT_SINGLE_VOLUME; present |= global_info.type == SNDRV_CONTROL_TYPE_BOOLEAN ? MIXER_PRESENT_SINGLE_SWITCH : MIXER_PRESENT_SINGLE_VOLUME;
if (global_info.type == SND_CONTROL_TYPE_INTEGER) { if (global_info.type == SNDRV_CONTROL_TYPE_INTEGER) {
if (min > global_info.value.integer.min) if (min > global_info.value.integer.min)
min = global_info.value.integer.min; min = global_info.value.integer.min;
if (max < global_info.value.integer.max) if (max < global_info.value.integer.max)
@ -505,7 +506,7 @@ static int build_input(snd_mixer_t *handle, const char *sname)
if ((hcontrol = test_mixer_id(handle, str, index)) != NULL) { if ((hcontrol = test_mixer_id(handle, str, index)) != NULL) {
if ((err = get_mixer_info(handle, str, index, &gswitch_info)) < 0) if ((err = get_mixer_info(handle, str, index, &gswitch_info)) < 0)
return err; return err;
if (gswitch_info.type == SND_CONTROL_TYPE_BOOLEAN) { if (gswitch_info.type == SNDRV_CONTROL_TYPE_BOOLEAN) {
if (voices < gswitch_info.values_count) if (voices < gswitch_info.values_count)
voices = gswitch_info.values_count; voices = gswitch_info.values_count;
caps |= SND_MIXER_SCTCAP_MUTE; caps |= SND_MIXER_SCTCAP_MUTE;
@ -517,7 +518,7 @@ static int build_input(snd_mixer_t *handle, const char *sname)
if ((hcontrol = test_mixer_id(handle, str, index)) != NULL) { if ((hcontrol = test_mixer_id(handle, str, index)) != NULL) {
if ((err = get_mixer_info(handle, str, index, &groute_info)) < 0) if ((err = get_mixer_info(handle, str, index, &groute_info)) < 0)
return err; return err;
if (groute_info.type == SND_CONTROL_TYPE_BOOLEAN && groute_info.values_count == 4) { if (groute_info.type == SNDRV_CONTROL_TYPE_BOOLEAN && groute_info.values_count == 4) {
if (voices < 2) if (voices < 2)
voices = 2; voices = 2;
caps |= SND_MIXER_SCTCAP_MUTE; caps |= SND_MIXER_SCTCAP_MUTE;
@ -529,7 +530,7 @@ static int build_input(snd_mixer_t *handle, const char *sname)
if ((hcontrol = test_mixer_id(handle, str, index)) != NULL) { if ((hcontrol = test_mixer_id(handle, str, index)) != NULL) {
if ((err = get_mixer_info(handle, str, index, &gvolume_info)) < 0) if ((err = get_mixer_info(handle, str, index, &gvolume_info)) < 0)
return err; return err;
if (gvolume_info.type == SND_CONTROL_TYPE_INTEGER) { if (gvolume_info.type == SNDRV_CONTROL_TYPE_INTEGER) {
if (voices < gvolume_info.values_count) if (voices < gvolume_info.values_count)
voices = gvolume_info.values_count; voices = gvolume_info.values_count;
if (min > gvolume_info.value.integer.min) if (min > gvolume_info.value.integer.min)
@ -545,7 +546,7 @@ static int build_input(snd_mixer_t *handle, const char *sname)
if ((hcontrol = test_mixer_id(handle, str, index)) != NULL) { if ((hcontrol = test_mixer_id(handle, str, index)) != NULL) {
if ((err = get_mixer_info(handle, str, index, &pswitch_info)) < 0) if ((err = get_mixer_info(handle, str, index, &pswitch_info)) < 0)
return err; return err;
if (pswitch_info.type == SND_CONTROL_TYPE_BOOLEAN) { if (pswitch_info.type == SNDRV_CONTROL_TYPE_BOOLEAN) {
if (voices < pswitch_info.values_count) if (voices < pswitch_info.values_count)
voices = pswitch_info.values_count; voices = pswitch_info.values_count;
caps |= SND_MIXER_SCTCAP_MUTE; caps |= SND_MIXER_SCTCAP_MUTE;
@ -557,7 +558,7 @@ static int build_input(snd_mixer_t *handle, const char *sname)
if ((hcontrol = test_mixer_id(handle, str, index)) != NULL) { if ((hcontrol = test_mixer_id(handle, str, index)) != NULL) {
if ((err = get_mixer_info(handle, str, index, &proute_info)) < 0) if ((err = get_mixer_info(handle, str, index, &proute_info)) < 0)
return err; return err;
if (proute_info.type == SND_CONTROL_TYPE_BOOLEAN && proute_info.values_count == 4) { if (proute_info.type == SNDRV_CONTROL_TYPE_BOOLEAN && proute_info.values_count == 4) {
if (voices < 2) if (voices < 2)
voices = 2; voices = 2;
caps |= SND_MIXER_SCTCAP_MUTE; caps |= SND_MIXER_SCTCAP_MUTE;
@ -569,7 +570,7 @@ static int build_input(snd_mixer_t *handle, const char *sname)
if ((hcontrol = test_mixer_id(handle, str, index)) != NULL) { if ((hcontrol = test_mixer_id(handle, str, index)) != NULL) {
if ((err = get_mixer_info(handle, str, index, &cswitch_info)) < 0) if ((err = get_mixer_info(handle, str, index, &cswitch_info)) < 0)
return err; return err;
if (cswitch_info.type == SND_CONTROL_TYPE_BOOLEAN) { if (cswitch_info.type == SNDRV_CONTROL_TYPE_BOOLEAN) {
if (voices < cswitch_info.values_count) if (voices < cswitch_info.values_count)
voices = cswitch_info.values_count; voices = cswitch_info.values_count;
caps |= SND_MIXER_SCTCAP_CAPTURE; caps |= SND_MIXER_SCTCAP_CAPTURE;
@ -581,7 +582,7 @@ static int build_input(snd_mixer_t *handle, const char *sname)
if ((hcontrol = test_mixer_id(handle, str, index)) != NULL) { if ((hcontrol = test_mixer_id(handle, str, index)) != NULL) {
if ((err = get_mixer_info(handle, str, index, &croute_info)) < 0) if ((err = get_mixer_info(handle, str, index, &croute_info)) < 0)
return err; return err;
if (croute_info.type == SND_CONTROL_TYPE_BOOLEAN && croute_info.values_count == 4) { if (croute_info.type == SNDRV_CONTROL_TYPE_BOOLEAN && croute_info.values_count == 4) {
if (voices < 2) if (voices < 2)
voices = 2; voices = 2;
caps |= SND_MIXER_SCTCAP_CAPTURE; caps |= SND_MIXER_SCTCAP_CAPTURE;
@ -593,7 +594,7 @@ static int build_input(snd_mixer_t *handle, const char *sname)
if ((hcontrol = test_mixer_id(handle, str, index)) != NULL) { if ((hcontrol = test_mixer_id(handle, str, index)) != NULL) {
if ((err = get_mixer_info(handle, str, index, &pvolume_info)) < 0) if ((err = get_mixer_info(handle, str, index, &pvolume_info)) < 0)
return err; return err;
if (pvolume_info.type == SND_CONTROL_TYPE_INTEGER) { if (pvolume_info.type == SNDRV_CONTROL_TYPE_INTEGER) {
if (voices < pvolume_info.values_count) if (voices < pvolume_info.values_count)
voices = pvolume_info.values_count; voices = pvolume_info.values_count;
if (min > pvolume_info.value.integer.min) if (min > pvolume_info.value.integer.min)
@ -609,7 +610,7 @@ static int build_input(snd_mixer_t *handle, const char *sname)
if ((hcontrol = test_mixer_id(handle, str, index)) != NULL) { if ((hcontrol = test_mixer_id(handle, str, index)) != NULL) {
if ((err = get_mixer_info(handle, str, index, &cvolume_info)) < 0) if ((err = get_mixer_info(handle, str, index, &cvolume_info)) < 0)
return err; return err;
if (cvolume_info.type == SND_CONTROL_TYPE_INTEGER) { if (cvolume_info.type == SNDRV_CONTROL_TYPE_INTEGER) {
if (voices < cvolume_info.values_count) if (voices < cvolume_info.values_count)
voices = cvolume_info.values_count; voices = cvolume_info.values_count;
if (min > pvolume_info.value.integer.min) if (min > pvolume_info.value.integer.min)
@ -629,7 +630,7 @@ static int build_input(snd_mixer_t *handle, const char *sname)
strcpy(str, "Mix"); strcpy(str, "Mix");
else if (!strcmp(str, "Master Mono")) /* special case */ else if (!strcmp(str, "Master Mono")) /* special case */
strcpy(str, "Mono Mix"); strcpy(str, "Mono Mix");
if (csource_info.type == SND_CONTROL_TYPE_ENUMERATED) { if (csource_info.type == SNDRV_CONTROL_TYPE_ENUMERATED) {
capture_item = 0; capture_item = 0;
if (!strcmp(csource_info.value.enumerated.name, str)) { if (!strcmp(csource_info.value.enumerated.name, str)) {
if (voices < csource_info.values_count) if (voices < csource_info.values_count)