peter: apps/recorder recording.c,1.114,1.115

Update of /cvsroot/rockbox/apps/recorder
In directory labb:/tmp/cvs-serv32461/apps/recorder

Modified Files:
	recording.c 
Log Message:
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.

Index: recording.c
===================================================================
RCS file: /cvsroot/rockbox/apps/recorder/recording.c,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -d -r1.114 -r1.115
--- recording.c	30 Jun 2006 22:45:40 -0000	1.114
+++ recording.c	1 Jul 2006 00:15:43 -0000	1.115
 <at>  <at>  -98,15 +98,6  <at>  <at> 
 #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
 <at>  <at>  -115,7 +106,14  <at>  <at> 
 #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)

 <at>  <at>  -622,7 +620,7  <at>  <at> 

             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

_______________________________________________
rockbox-cvs mailing list
rockbox-cvs <at> cool.haxx.se
http://cool.haxx.se/cgi-bin/mailman/listinfo/rockbox-cvs