diff options
Diffstat (limited to 'apps')
-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 @@ | |||
98 | #define REC_PREV BUTTON_UP | 98 | #define REC_PREV BUTTON_UP |
99 | #define REC_SETTINGS BUTTON_MODE | 99 | #define REC_SETTINGS BUTTON_MODE |
100 | 100 | ||
101 | #elif CONFIG_KEYPAD == GMINI100_PAD | ||
102 | #define REC_SHUTDOWN (BUTTON_OFF | BUTTON_REPEAT) | ||
103 | #define REC_STOPEXIT BUTTON_OFF | ||
104 | #define REC_RECPAUSE BUTTON_ON | ||
105 | #define REC_INC BUTTON_RIGHT | ||
106 | #define REC_DEC BUTTON_LEFT | ||
107 | #endif | ||
108 | |||
109 | #if (CONFIG_REMOTE_KEYPAD == H100_REMOTE) || (CONFIG_KEYPAD == IRIVER_H300_PAD) | ||
110 | #define REC_RC_SHUTDOWN (BUTTON_RC_STOP | BUTTON_REPEAT) | 101 | #define REC_RC_SHUTDOWN (BUTTON_RC_STOP | BUTTON_REPEAT) |
111 | #define REC_RC_STOPEXIT BUTTON_RC_STOP | 102 | #define REC_RC_STOPEXIT BUTTON_RC_STOP |
112 | #define REC_RC_RECPAUSE BUTTON_RC_ON | 103 | #define REC_RC_RECPAUSE BUTTON_RC_ON |
@@ -115,7 +106,14 @@ | |||
115 | #define REC_RC_NEXT BUTTON_RC_FF | 106 | #define REC_RC_NEXT BUTTON_RC_FF |
116 | #define REC_RC_PREV BUTTON_RC_REW | 107 | #define REC_RC_PREV BUTTON_RC_REW |
117 | #define REC_RC_SETTINGS BUTTON_RC_MODE | 108 | #define REC_RC_SETTINGS BUTTON_RC_MODE |
118 | #endif | 109 | |
110 | #elif CONFIG_KEYPAD == GMINI100_PAD | ||
111 | #define REC_SHUTDOWN (BUTTON_OFF | BUTTON_REPEAT) | ||
112 | #define REC_STOPEXIT BUTTON_OFF | ||
113 | #define REC_RECPAUSE BUTTON_ON | ||
114 | #define REC_INC BUTTON_RIGHT | ||
115 | #define REC_DEC BUTTON_LEFT | ||
116 | #endif | ||
119 | 117 | ||
120 | #define PM_HEIGHT ((LCD_HEIGHT >= 72) ? 2 : 1) | 118 | #define PM_HEIGHT ((LCD_HEIGHT >= 72) ? 2 : 1) |
121 | 119 | ||
@@ -622,7 +620,7 @@ bool recording_screen(void) | |||
622 | 620 | ||
623 | case REC_DEC: | 621 | case REC_DEC: |
624 | case REC_DEC | BUTTON_REPEAT: | 622 | case REC_DEC | BUTTON_REPEAT: |
625 | #ifdef REC_RC_INC | 623 | #ifdef REC_RC_DEC |
626 | case REC_RC_DEC: | 624 | case REC_RC_DEC: |
627 | case REC_RC_DEC | BUTTON_REPEAT: | 625 | case REC_RC_DEC | BUTTON_REPEAT: |
628 | #endif | 626 | #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 @@ | |||
57 | #define SETTINGS_NEXT BUTTON_RIGHT | 57 | #define SETTINGS_NEXT BUTTON_RIGHT |
58 | #define SETTINGS_ACCEPT BUTTON_ON | 58 | #define SETTINGS_ACCEPT BUTTON_ON |
59 | 59 | ||
60 | #define SETTINGS_RC_INC BUTTON_RC_FF | ||
61 | #define SETTINGS_RC_DEC BUTTON_RC_REW | ||
62 | #define SETTINGS_RC_OK BUTTON_RC_MENU | ||
63 | #define SETTINGS_RC_OK2 BUTTON_RC_SOURCE | ||
64 | #define SETTINGS_RC_CANCEL BUTTON_RC_STOP | ||
65 | #define SETTINGS_RC_CANCEL2 BUTTON_RC_MODE | ||
66 | #define SETTINGS_RC_PREV BUTTON_RC_SOURCE | ||
67 | #define SETTINGS_RC_NEXT BUTTON_RC_BITRATE | ||
68 | #define SETTINGS_RC_ACCEPT BUTTON_RC_ON | ||
69 | |||
60 | #elif CONFIG_KEYPAD == RECORDER_PAD | 70 | #elif CONFIG_KEYPAD == RECORDER_PAD |
61 | #define SETTINGS_INC BUTTON_UP | 71 | #define SETTINGS_INC BUTTON_UP |
62 | #define SETTINGS_DEC BUTTON_DOWN | 72 | #define SETTINGS_DEC BUTTON_DOWN |