forked from len0rd/rockbox
Keylock now locks combo keys too (mute, id3 viewer etc)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@4732 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
parent
1541baca47
commit
01db3ba568
1 changed files with 27 additions and 17 deletions
44
apps/wps.c
44
apps/wps.c
|
|
@ -499,6 +499,33 @@ static bool menu(void)
|
||||||
|
|
||||||
while (!exit) {
|
while (!exit) {
|
||||||
int button = button_get(true);
|
int button = button_get(true);
|
||||||
|
|
||||||
|
/* these are never locked */
|
||||||
|
switch (button)
|
||||||
|
{
|
||||||
|
/* key lock */
|
||||||
|
#ifdef HAVE_RECORDER_KEYPAD
|
||||||
|
case BUTTON_F1 | BUTTON_DOWN:
|
||||||
|
#else
|
||||||
|
case BUTTON_MENU | BUTTON_STOP:
|
||||||
|
#endif
|
||||||
|
keys_locked = !keys_locked;
|
||||||
|
display_keylock_text(keys_locked);
|
||||||
|
exit = true;
|
||||||
|
while (button_get(false)); /* clear button queue */
|
||||||
|
break;
|
||||||
|
|
||||||
|
case SYS_USB_CONNECTED:
|
||||||
|
status_set_playmode(STATUS_STOP);
|
||||||
|
usb_screen();
|
||||||
|
keys_locked = false;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (keys_locked) {
|
||||||
|
display_keylock_text(true);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
switch ( button ) {
|
switch ( button ) {
|
||||||
/* go into menu */
|
/* go into menu */
|
||||||
|
|
@ -539,18 +566,6 @@ static bool menu(void)
|
||||||
display_mute_text(muted);
|
display_mute_text(muted);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
/* key lock */
|
|
||||||
#ifdef HAVE_RECORDER_KEYPAD
|
|
||||||
case BUTTON_F1 | BUTTON_DOWN:
|
|
||||||
#else
|
|
||||||
case BUTTON_MENU | BUTTON_STOP:
|
|
||||||
#endif
|
|
||||||
keys_locked = !keys_locked;
|
|
||||||
display_keylock_text(keys_locked);
|
|
||||||
exit = true;
|
|
||||||
while (button_get(false)); /* clear button queue */
|
|
||||||
break;
|
|
||||||
|
|
||||||
#ifdef BUTTON_MENU
|
#ifdef BUTTON_MENU
|
||||||
/* change volume */
|
/* change volume */
|
||||||
case BUTTON_MENU | BUTTON_LEFT:
|
case BUTTON_MENU | BUTTON_LEFT:
|
||||||
|
|
@ -584,11 +599,6 @@ static bool menu(void)
|
||||||
#endif
|
#endif
|
||||||
exit = true;
|
exit = true;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case SYS_USB_CONNECTED:
|
|
||||||
status_set_playmode(STATUS_STOP);
|
|
||||||
usb_screen();
|
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
last_button = button;
|
last_button = button;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue