summaryrefslogtreecommitdiffstats
path: root/apps/bookmark.c
diff options
context:
space:
mode:
authorDave Chapman <dave@dchapman.com>2005-11-19 03:19:12 +0000
committerDave Chapman <dave@dchapman.com>2005-11-19 03:19:12 +0000
commitfe772405beb9e49e5c83c885763628985f81fc5f (patch)
tree23cb659d94c404e3a6426f26705ef8d5ff86f243 /apps/bookmark.c
parenta807fca49be192b676719c2aecc5056754d04c7f (diff)
downloadrockbox-fe772405beb9e49e5c83c885763628985f81fc5f.tar.gz
rockbox-fe772405beb9e49e5c83c885763628985f81fc5f.tar.bz2
rockbox-fe772405beb9e49e5c83c885763628985f81fc5f.zip
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
Diffstat (limited to 'apps/bookmark.c')
-rw-r--r--apps/bookmark.c17
1 files changed, 1 insertions, 16 deletions
diff --git a/apps/bookmark.c b/apps/bookmark.c
index c42f466283..c01567848a 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. */