devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Save a bit of binary size on targets which cannot record but share keymap with ones that can (Ondio SP, iPod G1/G2, Minis, and currently iPod G3).

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18007 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jens Arnold 2008-07-10 05:24:02 +00:00
parent 5cb85a81d2
commit 349ee09216
2 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
apps/keymaps/keymap-ipod.c
View file

@ -167,6 +167,7 @@ static const struct button_mapping button_context_keyboard[] = {
LAST_ITEM_IN_LIST LAST_ITEM_IN_LIST
}; /* button_context_keyboard */ }; /* button_context_keyboard */
#ifdef HAVE_RECORDING
const struct button_mapping button_context_recscreen[] = { const struct button_mapping button_context_recscreen[] = {
{ ACTION_REC_NEWFILE, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, { ACTION_REC_NEWFILE, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY },
@ -184,6 +185,7 @@ const struct button_mapping button_context_recscreen[] = {
LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
}; /* button_context_recscreen */ }; /* button_context_recscreen */
#endif
/* get_context_mapping returns a pointer to one of the above defined arrays depending on the context */ /* get_context_mapping returns a pointer to one of the above defined arrays depending on the context */
const struct button_mapping* get_context_mapping(int context) const struct button_mapping* get_context_mapping(int context)
@ -222,8 +224,10 @@ const struct button_mapping* get_context_mapping(int context)
return button_context_pitchscreen; return button_context_pitchscreen;
case CONTEXT_KEYBOARD: case CONTEXT_KEYBOARD:
return button_context_keyboard; return button_context_keyboard;
#ifdef HAVE_RECORDING
case CONTEXT_RECSCREEN: case CONTEXT_RECSCREEN:
return button_context_recscreen; return button_context_recscreen;
#endif
default: default:
return button_context_standard; return button_context_standard;
} }

12
apps/keymaps/keymap-ondio.c
View file

@ -136,6 +136,7 @@ static const struct button_mapping button_context_pitchscreen[] = {
LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
}; /* button_context_pitchscreen */ }; /* button_context_pitchscreen */
#ifdef HAVE_RECORDING
static const struct button_mapping button_context_recscreen[] = { static const struct button_mapping button_context_recscreen[] = {
{ ACTION_REC_PAUSE, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, { ACTION_REC_PAUSE, BUTTON_MENU|BUTTON_REL, BUTTON_MENU },
{ ACTION_SETTINGS_INC, BUTTON_RIGHT, BUTTON_NONE }, { ACTION_SETTINGS_INC, BUTTON_RIGHT, BUTTON_NONE },
@ -145,6 +146,7 @@ static const struct button_mapping button_context_recscreen[] = {
LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
}; /* button_context_recscreen */ }; /* button_context_recscreen */
#endif
static const struct button_mapping button_context_keyboard[] = { static const struct button_mapping button_context_keyboard[] = {
{ ACTION_KBD_LEFT, BUTTON_LEFT, BUTTON_NONE }, { ACTION_KBD_LEFT, BUTTON_LEFT, BUTTON_NONE },
@ -161,6 +163,7 @@ static const struct button_mapping button_context_keyboard[] = {
LAST_ITEM_IN_LIST LAST_ITEM_IN_LIST
}; /* button_context_keyboard */ }; /* button_context_keyboard */
#if CONFIG_TUNER #if CONFIG_TUNER
static const struct button_mapping button_context_radio[] = { static const struct button_mapping button_context_radio[] = {
{ ACTION_FM_MENU, BUTTON_MENU | BUTTON_REPEAT, BUTTON_NONE }, { ACTION_FM_MENU, BUTTON_MENU | BUTTON_REPEAT, BUTTON_NONE },
@ -172,13 +175,14 @@ static const struct button_mapping button_context_radio[] = {
{ ACTION_STD_PREVREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_STD_PREVREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_STD_NEXT, BUTTON_RIGHT, BUTTON_NONE }, { ACTION_STD_NEXT, BUTTON_RIGHT, BUTTON_NONE },
{ ACTION_STD_NEXTREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_STD_NEXTREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS) LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS)
}; };
#endif #endif
const struct button_mapping* get_context_mapping( int context ) const struct button_mapping* get_context_mapping( int context )
{ {
switch( context ) switch( context )
@ -206,9 +210,11 @@ const struct button_mapping* get_context_mapping( int context )
/* else fall through to CUSTOM|CONTEXT_TREE */ /* else fall through to CUSTOM|CONTEXT_TREE */
case CONTEXT_CUSTOM|CONTEXT_TREE: case CONTEXT_CUSTOM|CONTEXT_TREE:
return button_context_tree; return button_context_tree;
#ifdef HAVE_RECORDING
case CONTEXT_RECSCREEN: case CONTEXT_RECSCREEN:
case CONTEXT_SETTINGS_RECTRIGGER: case CONTEXT_SETTINGS_RECTRIGGER:
return button_context_recscreen; return button_context_recscreen;
#endif
case CONTEXT_KEYBOARD: case CONTEXT_KEYBOARD:
return button_context_keyboard; return button_context_keyboard;
#if CONFIG_TUNER #if CONFIG_TUNER