From cbfe90e4abd16e4ab2b9f3a6f9c24c55c4665a9a Mon Sep 17 00:00:00 2001 From: Dave Chapman Date: Sun, 5 Feb 2006 21:18:19 +0000 Subject: [PATCH] Use the iPod 4G button mappings for the iPod 3G as well (at least for now) git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8591 a1c6a512-1295-4272-9138-f99709370657 --- apps/bookmark.h | 2 +- apps/gui/gwps.h | 2 +- apps/gui/list.h | 2 +- apps/gui/select.h | 2 +- apps/gui/yesno.h | 2 +- apps/menu.h | 2 +- apps/recorder/keyboard.c | 2 +- apps/settings.h | 2 +- apps/tree.h | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/apps/bookmark.h b/apps/bookmark.h index adb6613482..f6f6bc8019 100644 --- a/apps/bookmark.h +++ b/apps/bookmark.h @@ -33,7 +33,7 @@ #define BOOKMARK_DELETE (BUTTON_ON | BUTTON_SELECT) #define BOOKMARK_DOWN BUTTON_DOWN -#elif (CONFIG_KEYPAD == IPOD_4G_PAD) +#elif (CONFIG_KEYPAD == IPOD_3G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD) #define BOOKMARK_SELECT BUTTON_SELECT #define BOOKMARK_DELETE (BUTTON_RIGHT | BUTTON_REPEAT) #define BOOKMARK_DOWN BUTTON_SCROLL_FWD diff --git a/apps/gui/gwps.h b/apps/gui/gwps.h index 9209cb9b1b..4d586147af 100644 --- a/apps/gui/gwps.h +++ b/apps/gui/gwps.h @@ -175,7 +175,7 @@ #define WPS_KEYLOCK (BUTTON_MENU | BUTTON_DOWN) #define WPS_ID3 (BUTTON_MENU | BUTTON_ON) -#elif (CONFIG_KEYPAD == IPOD_4G_PAD) +#elif (CONFIG_KEYPAD == IPOD_3G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD) /* TODO: Check WPS button assignments */ diff --git a/apps/gui/list.h b/apps/gui/list.h index 8643c4d047..23a0fc37b8 100644 --- a/apps/gui/list.h +++ b/apps/gui/list.h @@ -73,7 +73,7 @@ #define LIST_PGRIGHT (BUTTON_MENU | BUTTON_RIGHT) #define LIST_PGLEFT (BUTTON_MENU | BUTTON_LEFT) -#elif (CONFIG_KEYPAD == IPOD_4G_PAD) +#elif (CONFIG_KEYPAD == IPOD_3G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD) #define LIST_NEXT BUTTON_SCROLL_FWD #define LIST_PREV BUTTON_SCROLL_BACK diff --git a/apps/gui/select.h b/apps/gui/select.h index 00c05c8d58..d0e545bd51 100644 --- a/apps/gui/select.h +++ b/apps/gui/select.h @@ -54,7 +54,7 @@ #define SELECT_CANCEL BUTTON_STOP #define SELECT_CANCEL2 BUTTON_MENU -#elif (CONFIG_KEYPAD == IPOD_4G_PAD) +#elif (CONFIG_KEYPAD == IPOD_3G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD) #define SELECT_INC BUTTON_SCROLL_FWD #define SELECT_DEC BUTTON_SCROLL_BACK #define SELECT_OK BUTTON_SELECT diff --git a/apps/gui/yesno.h b/apps/gui/yesno.h index a39a2cbc69..20df1b5037 100644 --- a/apps/gui/yesno.h +++ b/apps/gui/yesno.h @@ -23,7 +23,7 @@ #elif CONFIG_KEYPAD == GMINI100_PAD #define YESNO_OK BUTTON_PLAY -#elif (CONFIG_KEYPAD == IPOD_4G_PAD) +#elif (CONFIG_KEYPAD == IPOD_3G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD) #define YESNO_OK BUTTON_RIGHT #elif (CONFIG_KEYPAD == IRIVER_IFP7XX_PAD) diff --git a/apps/menu.h b/apps/menu.h index cb96227dc1..2130a00683 100644 --- a/apps/menu.h +++ b/apps/menu.h @@ -68,7 +68,7 @@ #define MENU_ENTER BUTTON_RIGHT #define MENU_ENTER2 BUTTON_PLAY -#elif (CONFIG_KEYPAD == IPOD_4G_PAD) +#elif (CONFIG_KEYPAD == IPOD_3G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD) /* TODO: Check menu button assignments */ diff --git a/apps/recorder/keyboard.c b/apps/recorder/keyboard.c index 5bbc2140cb..13e7625bc4 100644 --- a/apps/recorder/keyboard.c +++ b/apps/recorder/keyboard.c @@ -101,7 +101,7 @@ #define KBD_UP BUTTON_UP #define KBD_DOWN BUTTON_DOWN -#elif (CONFIG_KEYPAD == IPOD_4G_PAD) +#elif (CONFIG_KEYPAD == IPOD_3G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD) #define KBD_MODES /* iPod uses 2 modes, picker and line edit */ #define KBD_SELECT (BUTTON_SELECT | BUTTON_REL) /* backspace in line edit */ diff --git a/apps/settings.h b/apps/settings.h index 53dfde0c50..3255f61ff3 100644 --- a/apps/settings.h +++ b/apps/settings.h @@ -92,7 +92,7 @@ #define SETTINGS_NEXT BUTTON_RIGHT #define SETTINGS_ACCEPT BUTTON_MENU -#elif (CONFIG_KEYPAD == IPOD_4G_PAD) +#elif (CONFIG_KEYPAD == IPOD_3G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD) #define SETTINGS_INC BUTTON_SCROLL_FWD #define SETTINGS_DEC BUTTON_SCROLL_BACK #define SETTINGS_OK BUTTON_SELECT diff --git a/apps/tree.h b/apps/tree.h index 0967fb373f..8fdcc883cf 100644 --- a/apps/tree.h +++ b/apps/tree.h @@ -135,7 +135,7 @@ #define TREE_CONTEXT2 (BUTTON_ON | BUTTON_PLAY) #define TREE_POWER_BTN BUTTON_ON -#elif (CONFIG_KEYPAD == IPOD_4G_PAD) +#elif (CONFIG_KEYPAD == IPOD_3G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD) #define TREE_NEXT BUTTON_SCROLL_FWD #define TREE_PREV BUTTON_SCROLL_BACK