summaryrefslogtreecommitdiff
path: root/apps/recorder/recording.c
diff options
context:
space:
mode:
Diffstat (limited to 'apps/recorder/recording.c')
-rw-r--r--apps/recorder/recording.c20
1 files changed, 9 insertions, 11 deletions
diff --git a/apps/recorder/recording.c b/apps/recorder/recording.c
index 9f2fc1e..bfe4c2e 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