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

Change the view toggle behavior

Browse source 
Added [F5] key to toggle to "All channels".
Back from help/proc screen keeps the old channel view mode.
This commit is contained in:
Takashi Iwai 2004-12-02 17:27:41 +00:00
parent 245c371483
commit 7b0c738323
1 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
alsamixer/alsamixer.c
View file

@ -180,6 +180,7 @@ static int mixer_needs_resize = 0;
static int mixer_minimize = 0; static int mixer_minimize = 0;
static int mixer_no_lrcorner = 0; static int mixer_no_lrcorner = 0;
static int mixer_view = VIEW_PLAYBACK; static int mixer_view = VIEW_PLAYBACK;
static int mixer_view_saved = VIEW_PLAYBACK;
static int mixer_max_x = 0; static int mixer_max_x = 0;
static int mixer_max_y = 0; static int mixer_max_y = 0;
static int mixer_ofs_x = 0; static int mixer_ofs_x = 0;
@ -253,12 +254,12 @@ static int mixer_help_xoffs = 0;
static int mixer_help_yoffs = 0; static int mixer_help_yoffs = 0;
static char *mixer_help_text = static char *mixer_help_text =
( (
"\n"
" Esc exit alsamixer\n" " Esc exit alsamixer\n"
" F1 show Help screen\n" " F1 show Help screen\n"
" F2 show /proc info screen\n" " F2 show /proc info screen\n"
" F3 show Playback controls only\n" " F3 show Playback controls only\n"
" F4 show Capture controls only\n" " F4 show Capture controls only\n"
" F5 show all controls\n"
" Return return to main screen\n" " Return return to main screen\n"
" Space toggle Capture facility\n" " Space toggle Capture facility\n"
" Tab toggle ExactMode\n" " Tab toggle ExactMode\n"
@ -1791,13 +1792,11 @@ mixer_iteration (void)
break; break;
case 13: /* Return */ case 13: /* Return */
case 10: /* NewLine */ case 10: /* NewLine */
if (mixer_view == VIEW_CHANNELS) { if (mixer_view != mixer_view_saved) {
mixer_clear (FALSE); mixer_view = mixer_view_saved;
} else {
mixer_view = VIEW_CHANNELS;
mixer_changed_state=1; mixer_changed_state=1;
mixer_reinit (); mixer_reinit ();
} }
key = 0; key = 0;
break; break;
case 'h': case 'h':
@ -1816,7 +1815,7 @@ mixer_iteration (void)
if (mixer_view == VIEW_PLAYBACK) { if (mixer_view == VIEW_PLAYBACK) {
mixer_clear (FALSE); mixer_clear (FALSE);
} else { } else {
mixer_view = VIEW_PLAYBACK; mixer_view = mixer_view_saved = VIEW_PLAYBACK;
mixer_changed_state=1; mixer_changed_state=1;
mixer_reinit (); mixer_reinit ();
} }
@ -1826,7 +1825,17 @@ mixer_iteration (void)
if (mixer_view == VIEW_CAPTURE) { if (mixer_view == VIEW_CAPTURE) {
mixer_clear (FALSE); mixer_clear (FALSE);
} else { } else {
mixer_view = VIEW_CAPTURE; mixer_view = mixer_view_saved = VIEW_CAPTURE;
mixer_changed_state=1;
mixer_reinit ();
}
key = 0;
break;
case KEY_F (5):
if (mixer_view == VIEW_CHANNELS) {
mixer_clear (FALSE);
} else {
mixer_view = mixer_view_saved = VIEW_CHANNELS;
mixer_changed_state=1; mixer_changed_state=1;
mixer_reinit (); mixer_reinit ();
} }