From 810f7178ae55b1a723956b4a605a2dae11bcdbcf Mon Sep 17 00:00:00 2001 From: Marcoen Hirschberg Date: Fri, 27 Apr 2007 19:24:31 +0000 Subject: [PATCH] make A the new 'clear settings' button for the Gigabeat as it was easy to accidentally trigger it with HOLD git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13279 a1c6a512-1295-4272-9138-f99709370657 --- apps/main.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/apps/main.c b/apps/main.c index 31bf32c714..a349cd22b6 100644 --- a/apps/main.c +++ b/apps/main.c @@ -83,7 +83,9 @@ #endif #ifdef BUTTON_REC -#define SETTINGS_RESET BUTTON_REC + #define SETTINGS_RESET BUTTON_REC +#elif (CONFIG_KEYPAD == GIGABEAT_PAD) + #define SETTINGS_RESET BUTTON_A #endif #if CONFIG_TUNER @@ -459,9 +461,10 @@ static void init(void) } #if defined(SETTINGS_RESET) || (CONFIG_KEYPAD == IPOD_4G_PAD) || \ - (CONFIG_KEYPAD == IRIVER_H10_PAD) || (CONFIG_KEYPAD == GIGABEAT_PAD) + (CONFIG_KEYPAD == IRIVER_H10_PAD) #ifdef SETTINGS_RESET - /* Reset settings if holding the rec button. */ + /* Reset settings if holding the reset button. (Rec on Archos, + A on Gigabeat) */ if ((button_status() & SETTINGS_RESET) == SETTINGS_RESET) #else /* Reset settings if the hold button is turned on */