From 6c33c51a4ca9907d23e3154d956fd6781122f492 Mon Sep 17 00:00:00 2001 From: Björn Stenberg Date: Sun, 19 Sep 2004 21:58:37 +0000 Subject: Redesigned the button handling. The code now uses symbolic function defines instead of checking for specific buttons. This makes it easier to add support for new devices with different button layouts. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@5091 a1c6a512-1295-4272-9138-f99709370657 --- apps/main_menu.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'apps/main_menu.c') diff --git a/apps/main_menu.c b/apps/main_menu.c index 1d2978e65e..da3d8ad5c1 100644 --- a/apps/main_menu.c +++ b/apps/main_menu.c @@ -231,24 +231,19 @@ bool show_info(void) /* Wait for a key to be pushed */ key = button_get_w_tmo(HZ*5); switch(key) { -#if defined(HAVE_PLAYER_KEYPAD) || defined(HAVE_NEO_KEYPAD) || defined(HAVE_ONDIO_KEYPAD) - case BUTTON_STOP | BUTTON_REL: -#else - case BUTTON_LEFT | BUTTON_REL: - case BUTTON_OFF | BUTTON_REL: -#endif + case SETTINGS_OK: + case SETTINGS_CANCEL: done = true; break; -#if defined(HAVE_RECORDER_KEYPAD) || defined(HAVE_ONDIO_KEYPAD) - case BUTTON_LEFT: - case BUTTON_RIGHT: + case SETTINGS_INC: + case SETTINGS_DEC: if (state == 1) state = 2; else state = 1; break; -#endif + default: if(default_event_handler(key) == SYS_USB_CONNECTED) return true; -- cgit v1.2.3