diff options
| author | Peter D'Hoye <peter.dhoye@gmail.com> | 2006-07-01 00:15:43 +0000 |
|---|---|---|
| committer | Peter D'Hoye <peter.dhoye@gmail.com> | 2006-07-01 00:15:43 +0000 |
| commit | eb34c4684d313fa677dcd9dda6a56b26af2b6b0e (patch) | |
| tree | 1992f1e1a8c55873cc6d46773f9d2b2f51f4ba16 | |
| parent | fcc23784fc19f8fd8e68d843874faf7693b59247 (diff) | |
Relocated the iriver remote button defines and added them to settings.h as well for use elsewhere (later). Uses part of patch 5615 by Martin Scarratt. Fixed also one typo.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10163 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | apps/recorder/recording.c | 20 | ||||
| -rw-r--r-- | apps/settings.h | 10 |
2 files changed, 19 insertions, 11 deletions
diff --git a/apps/recorder/recording.c b/apps/recorder/recording.c index 9f2fc1e18f..bfe4c2e099 100644 --- a/apps/recorder/recording.c +++ b/apps/recorder/recording.c @@ -98,15 +98,6 @@ #define REC_PREV BUTTON_UP #define REC_SETTINGS BUTTON_MODE -#elif CONFIG_KEYPAD == GMINI100_PAD -#define REC_SHUTDOWN (BUTTON_OFF | BUTTON_REPEAT) -#define REC_STOPEXIT BUTTON_OFF -#define REC_RECPAUSE BUTTON_ON -#define REC_INC BUTTON_RIGHT -#define REC_DEC BUTTON_LEFT -#endif - -#if (CONFIG_REMOTE_KEYPAD == H100_REMOTE) || (CONFIG_KEYPAD == IRIVER_H300_PAD) #define REC_RC_SHUTDOWN (BUTTON_RC_STOP | BUTTON_REPEAT) #define REC_RC_STOPEXIT BUTTON_RC_STOP #define REC_RC_RECPAUSE BUTTON_RC_ON @@ -115,7 +106,14 @@ #define REC_RC_NEXT BUTTON_RC_FF #define REC_RC_PREV BUTTON_RC_REW #define REC_RC_SETTINGS BUTTON_RC_MODE -#endif + +#elif CONFIG_KEYPAD == GMINI100_PAD +#define REC_SHUTDOWN (BUTTON_OFF | BUTTON_REPEAT) +#define REC_STOPEXIT BUTTON_OFF +#define REC_RECPAUSE BUTTON_ON +#define REC_INC BUTTON_RIGHT +#define REC_DEC BUTTON_LEFT +#endif #define PM_HEIGHT ((LCD_HEIGHT >= 72) ? 2 : 1) @@ -622,7 +620,7 @@ bool recording_screen(void) case REC_DEC: case REC_DEC | BUTTON_REPEAT: -#ifdef REC_RC_INC +#ifdef REC_RC_DEC case REC_RC_DEC: case REC_RC_DEC | BUTTON_REPEAT: #endif diff --git a/apps/settings.h b/apps/settings.h index 2d1dfccd2a..c6ed0ddd32 100644 --- a/apps/settings.h +++ b/apps/settings.h @@ -57,6 +57,16 @@ #define SETTINGS_NEXT BUTTON_RIGHT #define SETTINGS_ACCEPT BUTTON_ON +#define SETTINGS_RC_INC BUTTON_RC_FF +#define SETTINGS_RC_DEC BUTTON_RC_REW +#define SETTINGS_RC_OK BUTTON_RC_MENU +#define SETTINGS_RC_OK2 BUTTON_RC_SOURCE +#define SETTINGS_RC_CANCEL BUTTON_RC_STOP +#define SETTINGS_RC_CANCEL2 BUTTON_RC_MODE +#define SETTINGS_RC_PREV BUTTON_RC_SOURCE +#define SETTINGS_RC_NEXT BUTTON_RC_BITRATE +#define SETTINGS_RC_ACCEPT BUTTON_RC_ON + #elif CONFIG_KEYPAD == RECORDER_PAD #define SETTINGS_INC BUTTON_UP #define SETTINGS_DEC BUTTON_DOWN |