asgardius/alsa-utils
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-utils synced 2024-11-10 06:05:43 +01:00
Code Issues Projects Releases Packages Wiki Activity

Support quick volume change

Browse source 
Patch provided by nijel, ALSA BTS #785:

Attached patch adds support for quickly changing volume using 0-9 keys
in simmilar way as aumix does.
This commit is contained in:
Takashi Iwai 2005-01-12 11:08:53 +00:00
parent c074e5e93d
commit 681201610d
2 changed files with 59 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
alsamixer/alsamixer.1
View file

@ -83,14 +83,8 @@ in the top-left position together with the mixer name, etc.
The default view mode is the playback view. You can change it via
\fI-V\fP option.
Each view mode can be switched via keys, \fIF3\fP, \fIF4\fP and \fIF5\fP keys
for playback, capture and all views, respectively. \fITAB\fP key toggles the
current view mode circularly.
In addition to these view modes, you can switch to the help mode and
the proc info mode via \fIF1\fP and \fIF2\fP keys, respectively.
On terminals that can't use funtion keys like gnome-terminal, \fI?\fP and
\fI/\fP keys can be used alternatively for help and proc modes.
Each view mode can be switched via keyboard commands, too.
See the next section.
.SH KEYBOARD COMMANDS
\fBalsamixer\fP recognizes the following keyboard commands to control the soundcard.
@ -123,6 +117,18 @@ disabled first. This only works for valid input channels, of course.
\fIL\fP re-draws the screen.
.SS
View Mode Controls
Function keys are used to change view modes.
You can switch to the help mode and the proc info mode via \fIF1\fP and
\fIF2\fP keys, respectively.
On terminals that can't use funtion keys like gnome-terminal, \fI?\fP and
\fI/\fP keys can be used alternatively for help and proc modes.
\fIF3\fP, \fIF4\fP and \fIF5\fP keys are used to switch to playback, capture
and all view mode, respectively. \fITAB\fP key toggles the
current view mode circularly.
.SS
Quick Volume Changes
@ -142,6 +148,9 @@ independently, as follows:
If the currently selected mixer channel is not a stereo channel, then
all UP keys will work like \fIW\fP, and all DOWN keys will work like \fIX\fP.
The number keys from \fI0\fP to \fI9\fP are to change the absolute volume
quickly. They correspond to 0 to 90% volume.
.SS
Exiting

33
alsamixer/alsamixer.c
View file

@ -241,6 +241,7 @@ static int *mixer_grpidx;
static int *mixer_type;
static int mixer_volume_delta[2]; /* left/right volume delta in % */
static int mixer_volume_absolute = -1; /* absolute volume settings in % */
static int mixer_balance_volumes = 0; /* boolean */
static unsigned mixer_toggle_mute = 0; /* left/right mask */
static unsigned mixer_toggle_capture = 0; /* left/right mask */
@ -519,6 +520,20 @@ mixer_calc_volume(snd_mixer_elem_t *elem,
return CLAMP(vol1, min, max);
}
static int
mixer_convert_volume(snd_mixer_elem_t *elem,
int vol, int type)
{
int vol1;
long v;
long min, max;
if (type != MIXER_ELEM_CAPTURE)
snd_mixer_selem_get_playback_volume_range(elem, &min, &max);
else
snd_mixer_selem_get_capture_volume_range(elem, &min, &max);
return mixer_conv(vol, 0, 100, min, max);
}
/* update enum list */
static void update_enum_list(snd_mixer_elem_t *elem, int chn, int delta)
{
@ -576,6 +591,7 @@ mixer_write_cbar (int elem_index)
*/
if ((mixer_volume_delta[MIXER_CHN_LEFT] ||
mixer_volume_delta[MIXER_CHN_RIGHT] ||
mixer_volume_absolute != -1 ||
mixer_balance_volumes) &&
(mixer_type[elem_index] & MIXER_ELEM_HAS_VOLUME)) {
int mono;
@ -586,6 +602,9 @@ mixer_write_cbar (int elem_index)
else
joined = snd_mixer_selem_has_capture_volume_joined(elem);
mono |= joined;
if (mixer_volume_absolute != -1) {
vbalance = vright = vleft = mixer_convert_volume(elem, mixer_volume_absolute, type);
} else {
if (mono && !mixer_volume_delta[MIXER_CHN_LEFT])
mixer_volume_delta[MIXER_CHN_LEFT] = mixer_volume_delta[MIXER_CHN_RIGHT];
vleft = mixer_calc_volume(elem, mixer_volume_delta[MIXER_CHN_LEFT], type, chn_left);
@ -597,6 +616,7 @@ mixer_write_cbar (int elem_index)
} else {
vright = vleft;
}
}
if (joined) {
for (chn = 0; chn < SND_MIXER_SCHN_LAST; chn++)
@ -689,6 +709,7 @@ mixer_write_cbar (int elem_index)
}
mixer_volume_delta[MIXER_CHN_LEFT] = mixer_volume_delta[MIXER_CHN_RIGHT] = 0;
mixer_volume_absolute = -1;
mixer_balance_volumes = 0;
}
@ -2083,6 +2104,18 @@ mixer_iteration (void)
case 'X':
mixer_add_delta(-1);
break;
case '0':
case '1':
case '2':
case '3':
case '4':
case '5':
case '6':
case '7':
case '8':
case '9':
mixer_volume_absolute = 10 * (key - '0');
break;
case 'q':
mixer_volume_delta[MIXER_CHN_LEFT] = 1;
case 'Q':