From 20debbfa5d2390ea54ff07164f93495766f5828b Mon Sep 17 00:00:00 2001 From: Dave Chapman Date: Thu, 2 Feb 2006 12:14:23 +0000 Subject: iPod: Fix some button-mapping bugs and inconsistencies git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8531 a1c6a512-1295-4272-9138-f99709370657 --- apps/gui/gwps.h | 1 + apps/menu.h | 1 + apps/tree.h | 3 ++- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/apps/gui/gwps.h b/apps/gui/gwps.h index 7cb1cde7eb..9209cb9b1b 100644 --- a/apps/gui/gwps.h +++ b/apps/gui/gwps.h @@ -189,6 +189,7 @@ #define WPS_DECVOL BUTTON_SCROLL_BACK #define WPS_PAUSE BUTTON_PLAY | BUTTON_REL #define WPS_MENU (BUTTON_MENU | BUTTON_REL) +#define WPS_MENU_PRE BUTTON_MENU #define WPS_BROWSE (BUTTON_SELECT | BUTTON_REL) #define WPS_BROWSE_PRE BUTTON_SELECT #define WPS_EXIT (BUTTON_PLAY | BUTTON_REPEAT) diff --git a/apps/menu.h b/apps/menu.h index cf942ea382..cb96227dc1 100644 --- a/apps/menu.h +++ b/apps/menu.h @@ -77,6 +77,7 @@ #define MENU_EXIT BUTTON_LEFT #define MENU_EXIT_MENU BUTTON_MENU #define MENU_ENTER BUTTON_RIGHT +#define MENU_ENTER2 BUTTON_SELECT #elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD diff --git a/apps/tree.h b/apps/tree.h index cda8410629..fa0421865d 100644 --- a/apps/tree.h +++ b/apps/tree.h @@ -144,7 +144,8 @@ #define TREE_ENTER BUTTON_RIGHT #define TREE_RUN (BUTTON_SELECT | BUTTON_REL) #define TREE_RUN_PRE BUTTON_SELECT -#define TREE_MENU BUTTON_MENU +#define TREE_MENU (BUTTON_MENU | BUTTON_REL) +#define TREE_MENU_PRE BUTTON_MENU #define TREE_WPS (BUTTON_PLAY | BUTTON_REL) #define TREE_WPS_PRE BUTTON_PLAY #define TREE_CONTEXT (BUTTON_SELECT | BUTTON_REPEAT) -- cgit v1.2.3