From fe772405beb9e49e5c83c885763628985f81fc5f Mon Sep 17 00:00:00 2001 From: Dave Chapman Date: Sat, 19 Nov 2005 03:19:12 +0000 Subject: 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 --- apps/tree.h | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) (limited to 'apps/tree.h') diff --git a/apps/tree.h b/apps/tree.h index aa7571a..74b33fa 100644 --- a/apps/tree.h +++ b/apps/tree.h @@ -30,6 +30,7 @@ #define TREE_NEXT BUTTON_DOWN #define TREE_PREV BUTTON_UP #define TREE_EXIT BUTTON_LEFT +#define TREE_ABORT BUTTON_OFF #define TREE_ENTER BUTTON_RIGHT #define TREE_RUN (BUTTON_SELECT | BUTTON_REL) #define TREE_RUN_PRE BUTTON_SELECT @@ -63,6 +64,7 @@ #define TREE_NEXT BUTTON_DOWN #define TREE_PREV BUTTON_UP #define TREE_EXIT BUTTON_LEFT +#define TREE_ABORT BUTTON_OFF #define TREE_ENTER BUTTON_RIGHT #define TREE_RUN (BUTTON_PLAY | BUTTON_REL) #define TREE_RUN_PRE BUTTON_PLAY @@ -86,6 +88,7 @@ #define TREE_NEXT BUTTON_RIGHT #define TREE_PREV BUTTON_LEFT #define TREE_EXIT BUTTON_STOP +#define TREE_ABORT BUTTON_STOP #define TREE_RUN (BUTTON_PLAY | BUTTON_REL) #define TREE_RUN_PRE BUTTON_PLAY #define TREE_MENU BUTTON_MENU @@ -104,6 +107,7 @@ #define TREE_NEXT BUTTON_DOWN #define TREE_PREV BUTTON_UP #define TREE_EXIT BUTTON_LEFT +#define TREE_ABORT BUTTON_OFF #define TREE_RUN (BUTTON_RIGHT | BUTTON_REL) #define TREE_RUN_PRE BUTTON_RIGHT #define TREE_MENU (BUTTON_MENU | BUTTON_REPEAT) @@ -130,22 +134,21 @@ #define TREE_CONTEXT2 (BUTTON_ON | BUTTON_PLAY) #define TREE_POWER_BTN BUTTON_ON -#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_NANO_PAD) +#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ + (CONFIG_KEYPAD == IPOD_NANO_PAD) -/* TODO: Check Tree button assignments */ - -#define TREE_NEXT BUTTON_DOWN -#define TREE_PREV BUTTON_UP +#define TREE_NEXT BUTTON_SCROLL_FWD +#define TREE_PREV BUTTON_SCROLL_BACK #define TREE_EXIT BUTTON_LEFT -#define TREE_RUN (BUTTON_RIGHT | BUTTON_REL) -#define TREE_RUN_PRE BUTTON_RIGHT +#define TREE_ABORT BUTTON_LEFT +#define TREE_ENTER BUTTON_RIGHT +#define TREE_RUN (BUTTON_SELECT | BUTTON_REL) +#define TREE_RUN_PRE BUTTON_SELECT #define TREE_MENU (BUTTON_MENU | BUTTON_REPEAT) #define TREE_MENU_PRE BUTTON_MENU #define TREE_WPS (BUTTON_MENU | BUTTON_REL) #define TREE_WPS_PRE BUTTON_MENU -#define TREE_CONTEXT (BUTTON_RIGHT | BUTTON_REPEAT) -#define TREE_POWER_BTN BUTTON_OFF - +#define TREE_CONTEXT (BUTTON_SELECT | BUTTON_REPEAT) #endif -- cgit v1.1