diff options
| author | Tomas Salfischberger <tomas@rockbox.org> | 2005-06-12 17:56:07 +0000 |
|---|---|---|
| committer | Tomas Salfischberger <tomas@rockbox.org> | 2005-06-12 17:56:07 +0000 |
| commit | b56f42494b6ca785c36fc48ae5e662adaca21902 (patch) | |
| tree | 1a43268e3db0502a5cc8cf401e95ac4f59de168f /apps | |
| parent | c19e0f0d02fe1e87f24fc3037edd4e1566280d86 (diff) | |
| download | rockbox-b56f42494b6ca785c36fc48ae5e662adaca21902.tar.gz rockbox-b56f42494b6ca785c36fc48ae5e662adaca21902.zip | |
Added menu button for remote (because the menu now supports the remote too).
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6693 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/wps.c | 9 | ||||
| -rw-r--r-- | apps/wps.h | 3 |
2 files changed, 10 insertions, 2 deletions
diff --git a/apps/wps.c b/apps/wps.c index d702282a25..783f2528ba 100644 --- a/apps/wps.c +++ b/apps/wps.c | |||
| @@ -592,9 +592,16 @@ long wps_show(void) | |||
| 592 | break; | 592 | break; |
| 593 | 593 | ||
| 594 | /* menu key functions */ | 594 | /* menu key functions */ |
| 595 | #ifdef WPS_RC_MENU | ||
| 596 | case WPS_RC_MENU: | ||
| 597 | #endif | ||
| 595 | case WPS_MENU: | 598 | case WPS_MENU: |
| 596 | #ifdef WPS_MENU_PRE | 599 | #ifdef WPS_MENU_PRE |
| 597 | if (lastbutton != WPS_MENU_PRE) | 600 | if ((lastbutton != WPS_MENU_PRE) |
| 601 | #ifdef WPS_RC_MENU_PRE | ||
| 602 | && (lastbutton != WPS_RC_MENU_PRE) | ||
| 603 | #endif | ||
| 604 | ) | ||
| 598 | break; | 605 | break; |
| 599 | #endif | 606 | #endif |
| 600 | lcd_stop_scroll(); | 607 | lcd_stop_scroll(); |
diff --git a/apps/wps.h b/apps/wps.h index 668f9f6bbd..091ec80553 100644 --- a/apps/wps.h +++ b/apps/wps.h | |||
| @@ -46,7 +46,8 @@ | |||
| 46 | #define WPS_RC_INCVOL BUTTON_RC_VOL_UP | 46 | #define WPS_RC_INCVOL BUTTON_RC_VOL_UP |
| 47 | #define WPS_RC_DECVOL BUTTON_RC_VOL_DOWN | 47 | #define WPS_RC_DECVOL BUTTON_RC_VOL_DOWN |
| 48 | #define WPS_RC_EXIT BUTTON_RC_STOP | 48 | #define WPS_RC_EXIT BUTTON_RC_STOP |
| 49 | 49 | #define WPS_RC_MENU (BUTTON_RC_MENU | BUTTON_REL) | |
| 50 | #define WPS_RC_MENU_PRE BUTTON_RC_MENU | ||
| 50 | 51 | ||
| 51 | #elif CONFIG_KEYPAD == RECORDER_PAD | 52 | #elif CONFIG_KEYPAD == RECORDER_PAD |
| 52 | #define WPS_NEXT (BUTTON_RIGHT | BUTTON_REL) | 53 | #define WPS_NEXT (BUTTON_RIGHT | BUTTON_REL) |