Redesigned the button handling. The code now uses symbolic function defines instead of checking for specific buttons. This makes it easier to add support for new devices with different button layouts.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@5091 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 25 insertions, 0 deletions

diff --git a/apps/settings.h b/apps/settings.h
index 331e8dc904..0af466c5f7 100644
--- a/apps/settings.h
+++ b/apps/settings.h
@@ -33,6 +33,31 @@
 
 #define MAX_FILENAME 20
 
+/* button definitions */
+#ifdef HAVE_RECORDER_KEYPAD
+#define SETTINGS_INC     BUTTON_UP
+#define SETTINGS_DEC     BUTTON_DOWN
+#define SETTINGS_OK      (BUTTON_PLAY|BUTTON_REL)
+#define SETTINGS_OK2     (BUTTON_LEFT|BUTTON_REL)
+#define SETTINGS_CANCEL  (BUTTON_OFF|BUTTON_REL)
+#define SETTINGS_CANCEL2 (BUTTON_F1|BUTTON_REL)
+
+#elif defined HAVE_PLAYER_KEYPAD
+#define SETTINGS_INC     BUTTON_RIGHT
+#define SETTINGS_DEC     BUTTON_LEFT
+#define SETTINGS_OK      (BUTTON_PLAY|BUTTON_REL)
+#define SETTINGS_CANCEL  (BUTTON_STOP|BUTTON_REL)
+#define SETTINGS_CANCEL2 (BUTTON_MENU|BUTTON_REL)
+
+#elif defined HAVE_ONDIO_KEYPAD
+#define SETTINGS_INC    BUTTON_UP
+#define SETTINGS_DEC    BUTTON_DOWN
+#define SETTINGS_OK     (BUTTON_RIGHT|BUTTON_REL)
+#define SETTINGS_OK2    (BUTTON_LEFT|BUTTON_REL)
+#define SETTINGS_CANCEL (BUTTON_MENU|BUTTON_REL)
+
+#endif
+
 /* data structures */
 
 #define RESUME_OFF 0