iPod: First attempt to implement sensible button mappings. Changes to all targets to replace a small number of references to raw button codes (BUTTON_???) with their abstract equivalents.

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

1 files changed, 1 insertions, 16 deletions

diff --git a/apps/bookmark.c b/apps/bookmark.c
index c42f466..c015678 100644
--- a/apps/bookmark.c
+++ b/apps/bookmark.c
@@ -473,7 +473,7 @@ bool bookmark_autoload(const char* file)
             switch(key)
             {
 #ifdef HAVE_LCD_BITMAP
-                case BUTTON_DOWN:
+                case BOOKMARK_DOWN:
                     return bookmark_load(global_bookmark_file_name, false);
 #endif
                 case SETTINGS_OK:
@@ -567,21 +567,6 @@ static int get_bookmark_count(const char* bookmark_file_name)
     
 }
 
-#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)
-
-#elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || \
- (CONFIG_KEYPAD == IRIVER_H300_PAD)
-#define BOOKMARK_SELECT BUTTON_SELECT
-#define BOOKMARK_DELETE (BUTTON_ON | BUTTON_SELECT)
-
-#else /* player, recorder, gmini */
-#define BOOKMARK_SELECT BUTTON_PLAY
-#define BOOKMARK_DELETE (BUTTON_ON | BUTTON_PLAY)
-#endif
-
 /* ----------------------------------------------------------------------- */
 /* This displays a the bookmarks in a file and allows the user to          */
 /* select one to play.                                                     */