Finally, the new button action system is here, thanks to Jonathan Gordon. Some button mappings have changed and other things may break. Comments should go to the forum, http://forums.rockbox.org/index.php?topic=5829.0 or the mailing list.

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

1 files changed, 0 insertions, 48 deletions

diff --git a/apps/bookmark.h b/apps/bookmark.h
index 72453aaf7f..16f4e5609f 100644
--- a/apps/bookmark.h
+++ b/apps/bookmark.h
@@ -21,54 +21,6 @@
 
 #include <stdbool.h>
 
-#if CONFIG_KEYPAD == ONDIO_PAD
-#define BOOKMARK_SELECT_PRE BUTTON_RIGHT
-#define BOOKMARK_SELECT (BUTTON_RIGHT | BUTTON_REL)
-#define BOOKMARK_DELETE (BUTTON_RIGHT | BUTTON_REPEAT)
-#define BOOKMARK_DOWN BUTTON_DOWN
-
-#elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || \
-      (CONFIG_KEYPAD == IRIVER_H300_PAD)
-#define BOOKMARK_SELECT BUTTON_SELECT
-#define BOOKMARK_DELETE (BUTTON_ON | BUTTON_SELECT)
-#define BOOKMARK_DOWN BUTTON_DOWN
-#define BOOKMARK_RC_SELECT BUTTON_RC_MENU
-#define BOOKMARK_RC_DELETE (BUTTON_RC_ON | BUTTON_RC_MENU)
-#define BOOKMARK_RC_DOWN BUTTON_RC_FF
-#define BOOKMARK_RC_EXIT BUTTON_RC_STOP
-
-#elif (CONFIG_KEYPAD == IPOD_3G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD)
-#define BOOKMARK_SELECT BUTTON_SELECT
-#define BOOKMARK_DELETE (BUTTON_RIGHT | BUTTON_REPEAT)
-#define BOOKMARK_DOWN BUTTON_SCROLL_FWD
-
-#elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD
-#define BOOKMARK_SELECT BUTTON_SELECT
-#define BOOKMARK_DELETE (BUTTON_PLAY | BUTTON_SELECT)
-#define BOOKMARK_DOWN BUTTON_DOWN
-
-#elif CONFIG_KEYPAD == IAUDIO_X5_PAD
-#define BOOKMARK_SELECT BUTTON_SELECT
-#define BOOKMARK_DELETE BUTTON_REC | BUTTON_REPEAT
-#define BOOKMARK_DOWN BUTTON_DOWN
-
-#elif CONFIG_KEYPAD == GIGABEAT_PAD
-#define BOOKMARK_SELECT BUTTON_MENU
-#define BOOKMARK_DELETE BUTTON_POWER
-#define BOOKMARK_DOWN BUTTON_A
-
-#elif CONFIG_KEYPAD == IRIVER_H10_PAD
-#define BOOKMARK_SELECT BUTTON_PLAY
-#define BOOKMARK_DELETE (BUTTON_FF | BUTTON_REPEAT)
-#define BOOKMARK_DOWN BUTTON_SCROLL_DOWN
-
-#else /* player, recorder, gmini */
-#define BOOKMARK_SELECT BUTTON_PLAY
-#define BOOKMARK_DELETE (BUTTON_ON | BUTTON_PLAY)
-#define BOOKMARK_DOWN BUTTON_DOWN
-
-#endif
-
 bool bookmark_load_menu(void);
 bool bookmark_autobookmark(void);
 bool bookmark_create_menu(void);