asgardius/alsa-utils
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-utils synced 2024-11-14 04:55:41 +01:00
Code Issues Projects Releases Packages Wiki Activity

alsamixer - Handle capture enums separately

Browse source 
The capture enum controls should appear only in capture and all views.
This is a fix for Input Source enum controls.
This commit is contained in:
Takashi Iwai 2007-08-29 14:49:55 +02:00
parent f13bea104b
commit cbb2d555df
1 changed files with 23 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
alsamixer/alsamixer.c
View file

@ -210,7 +210,7 @@ enum {
MIXER_ELEM_FRONT, MIXER_ELEM_REAR, MIXER_ELEM_FRONT, MIXER_ELEM_REAR,
MIXER_ELEM_CENTER, MIXER_ELEM_WOOFER, MIXER_ELEM_CENTER, MIXER_ELEM_WOOFER,
MIXER_ELEM_CAPTURE, MIXER_ELEM_CAPTURE,
MIXER_ELEM_ENUM, MIXER_ELEM_ENUM, MIXER_ELEM_CAPTURE_ENUM,
MIXER_ELEM_END MIXER_ELEM_END
}; };
@ -702,7 +702,7 @@ mixer_write_cbar (int elem_index)
/* enum list /* enum list
*/ */
if (type == MIXER_ELEM_ENUM) { if (type == MIXER_ELEM_ENUM || type == MIXER_ELEM_CAPTURE_ENUM) {
if (mixer_volume_delta[MIXER_CHN_LEFT]) if (mixer_volume_delta[MIXER_CHN_LEFT])
update_enum_list(elem, MIXER_CHN_LEFT, mixer_volume_delta[MIXER_CHN_LEFT]); update_enum_list(elem, MIXER_CHN_LEFT, mixer_volume_delta[MIXER_CHN_LEFT]);
if (mixer_volume_delta[MIXER_CHN_RIGHT]) if (mixer_volume_delta[MIXER_CHN_RIGHT])
@ -983,7 +983,7 @@ mixer_update_cbar (int elem_index)
snd_mixer_selem_get_playback_switch(elem, chn_right, &swr); snd_mixer_selem_get_playback_switch(elem, chn_right, &swr);
extra_info = !swl && !swr ? " [Off]" : ""; extra_info = !swl && !swr ? " [Off]" : "";
} }
if (type == MIXER_ELEM_ENUM) { if (type == MIXER_ELEM_ENUM || type == MIXER_ELEM_CAPTURE_ENUM) {
/* FIXME: should show the item names of secondary and later channels... */ /* FIXME: should show the item names of secondary and later channels... */
unsigned int eidx, length; unsigned int eidx, length;
tmp[0]=' '; tmp[0]=' ';
@ -1049,7 +1049,7 @@ mixer_update_cbar (int elem_index)
y--; y--;
/* enum list? */ /* enum list? */
if (type == MIXER_ELEM_ENUM) { if (type == MIXER_ELEM_ENUM || type == MIXER_ELEM_CAPTURE_ENUM) {
display_enum_list(elem, y, x); display_enum_list(elem, y, x);
return; /* no more to display */ return; /* no more to display */
} }
@ -1752,7 +1752,7 @@ __again:
if (elem == NULL) if (elem == NULL)
CHECK_ABORT (ERR_FCN, "snd_mixer_find_selem()", -EINVAL); CHECK_ABORT (ERR_FCN, "snd_mixer_find_selem()", -EINVAL);
if ( (mixer_view == VIEW_PLAYBACK) || (mixer_view == VIEW_CHANNELS) ) { if ( (mixer_view == VIEW_PLAYBACK) || (mixer_view == VIEW_CHANNELS) ) {
for (i = 0; i < MIXER_ELEM_CAPTURE; i++) { for (i = MIXER_ELEM_FRONT; i <= MIXER_ELEM_WOOFER; i++) {
int ok; int ok;
for (j = ok = 0; j < 2; j++) { for (j = ok = 0; j < 2; j++) {
if (mixer_changed_state) if (mixer_changed_state)
@ -1764,6 +1764,9 @@ __again:
sid = (snd_mixer_selem_id_t *)(((char *)mixer_sid) + snd_mixer_selem_id_sizeof() * idx); sid = (snd_mixer_selem_id_t *)(((char *)mixer_sid) + snd_mixer_selem_id_sizeof() * idx);
mixer_grpidx[elem_index] = idx; mixer_grpidx[elem_index] = idx;
if (snd_mixer_selem_is_enumerated(elem)) { if (snd_mixer_selem_is_enumerated(elem)) {
if (mixer_view == VIEW_PLAYBACK &&
snd_mixer_selem_is_enum_capture(elem))
continue;
mixer_type[elem_index] = MIXER_ELEM_ENUM; mixer_type[elem_index] = MIXER_ELEM_ENUM;
} else { } else {
mixer_type[elem_index] = i; mixer_type[elem_index] = i;
@ -1795,15 +1798,23 @@ __again:
(nelems_added == 0 && snd_mixer_selem_has_capture_switch(elem)) && (nelems_added == 0 && snd_mixer_selem_has_capture_switch(elem)) &&
(mixer_view == VIEW_CAPTURE || !snd_mixer_selem_has_common_switch(elem))) (mixer_view == VIEW_CAPTURE || !snd_mixer_selem_has_common_switch(elem)))
do_add = 1; do_add = 1;
if (!do_add &&
mixer_view == VIEW_CAPTURE && snd_mixer_selem_is_enum_capture(elem))
do_add = 1;
if (do_add) { if (do_add) {
mixer_grpidx[elem_index] = idx; mixer_grpidx[elem_index] = idx;
mixer_type[elem_index] = MIXER_ELEM_CAPTURE; if (snd_mixer_selem_is_enum_capture(elem))
if (nelems_added == 0 && snd_mixer_selem_has_capture_switch(elem)) mixer_type[elem_index] = MIXER_ELEM_CAPTURE_ENUM;
mixer_type[elem_index] |= MIXER_ELEM_CAPTURE_SWITCH; else {
if (nelems_added) mixer_type[elem_index] = MIXER_ELEM_CAPTURE;
mixer_type[elem_index] |= MIXER_ELEM_CAPTURE_SUFFIX; if (nelems_added == 0 && snd_mixer_selem_has_capture_switch(elem))
if (snd_mixer_selem_has_capture_volume(elem)) mixer_type[elem_index] |= MIXER_ELEM_CAPTURE_SWITCH;
mixer_type[elem_index] |= MIXER_ELEM_HAS_VOLUME; if (nelems_added)
mixer_type[elem_index] |= MIXER_ELEM_CAPTURE_SUFFIX;
if (snd_mixer_selem_has_capture_volume(elem))
mixer_type[elem_index] |= MIXER_ELEM_HAS_VOLUME;
}
elem_index++; elem_index++;
if (elem_index >= mixer_n_elems) if (elem_index >= mixer_n_elems)
break; break;