summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcoen Hirschberg <marcoen@gmail.com>2007-04-27 19:24:31 +0000
committerMarcoen Hirschberg <marcoen@gmail.com>2007-04-27 19:24:31 +0000
commit810f7178ae55b1a723956b4a605a2dae11bcdbcf (patch)
tree86348793e4bb4bdd08c8e70718022a108996edad
parent7eb8512bf0b69d2405c8efc81f6ecab0e3f7c7e5 (diff)
downloadrockbox-810f7178ae55b1a723956b4a605a2dae11bcdbcf.tar.gz
rockbox-810f7178ae55b1a723956b4a605a2dae11bcdbcf.tar.bz2
rockbox-810f7178ae55b1a723956b4a605a2dae11bcdbcf.zip
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
-rw-r--r--apps/main.c9
1 files 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 */