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
This commit is contained in:
parent
afb2564b84
commit
cbfe90e4ab
9 changed files with 9 additions and 9 deletions
|
@ -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
|
||||
|
|
|
@ -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 */
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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 */
|
||||
|
||||
|
|
|
@ -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 */
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue