len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-11-09 13:12:37 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed the bookmark screen keys

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10714 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jonathan Gordon 2006-08-23 08:53:38 +00:00
parent eed923ec83
commit 2e3cfafa0b
6 changed files with 35 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
apps/keymaps/keymap-h1x0_h3x0.c
View file

@ -183,7 +183,8 @@ const struct button_mapping button_context_eq[] = {
const struct button_mapping button_context_bmark[] = { const struct button_mapping button_context_bmark[] = {
{ ACTION_BMS_DELETE, BUTTON_REC, BUTTON_NONE }, { ACTION_BMS_DELETE, BUTTON_REC, BUTTON_NONE },
{ ACTION_STD_OK, BUTTON_SELECT, BUTTON_NONE }, { ACTION_BMS_SELECT, BUTTON_SELECT, BUTTON_NONE },
{ ACTION_BMS_EXIT, BUTTON_OFF, BUTTON_NONE },
LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS), LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS),
}; /* button_context_settings_bmark */ }; /* button_context_settings_bmark */

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

@ -116,6 +116,8 @@ const struct button_mapping button_context_yesno[] = {
const struct button_mapping button_context_bmark[] = { const struct button_mapping button_context_bmark[] = {
{ ACTION_BMS_DELETE, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, { ACTION_BMS_DELETE, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU },
{ ACTION_BMS_SELECT, BUTTON_SELECT, BUTTON_NONE },
{ ACTION_BMS_EXIT, BUTTON_PLAY, BUTTON_NONE },
LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS), LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS),
}; /* button_context_settings_bmark */ }; /* button_context_settings_bmark */

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

@ -107,9 +107,10 @@ const struct button_mapping button_context_yesno[] = {
struct button_mapping button_context_bmark[] = { struct button_mapping button_context_bmark[] = {
{ ACTION_NONE, BUTTON_LEFT, BUTTON_NONE }, { ACTION_NONE, BUTTON_LEFT, BUTTON_NONE },
{ ACTION_BMS_DELETE, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT }, { ACTION_BMS_DELETE, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT },
{ ACTION_STD_CANCEL, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, { ACTION_BMS_EXIT, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT },
{ ACTION_BMS_SELECT, BUTTON_RIGHT, BUTTON_NONE },
LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS), LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD),
}; /* button_context_settings_bmark */ }; /* button_context_settings_bmark */
const struct button_mapping button_context_pitchscreen[] = { const struct button_mapping button_context_pitchscreen[] = {

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

@ -84,6 +84,15 @@ static const struct button_mapping button_context_yesno[] = {
LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
}; /* button_context_settings_yesno */ }; /* button_context_settings_yesno */
struct button_mapping button_context_bmark[] = {
{ ACTION_BMS_DELETE, BUTTON_PLAY|BUTTON_ON, BUTTON_PLAY },
{ ACTION_BMS_DELETE, BUTTON_PLAY|BUTTON_ON, BUTTON_ON },
{ ACTION_BMS_EXIT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_BMS_SELECT, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY },
LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD),
}; /* button_context_settings_bmark */
/***************************************************************************** /*****************************************************************************
* Remote control mappings * Remote control mappings
*****************************************************************************/ *****************************************************************************/
@ -142,7 +151,8 @@ const struct button_mapping* get_context_mapping( int context )
case CONTEXT_TREE: case CONTEXT_TREE:
return button_context_tree; return button_context_tree;
case CONTEXT_BOOKMARKSCREEN:
return button_context_bmark;
case CONTEXT_STD: case CONTEXT_STD:
case CONTEXT_LIST: case CONTEXT_LIST:
case CONTEXT_MAINMENU: case CONTEXT_MAINMENU:

11
apps/keymaps/keymap-recorder.c
View file

@ -184,6 +184,14 @@ const struct button_mapping button_context_keyboard[] = {
LAST_ITEM_IN_LIST LAST_ITEM_IN_LIST
}; /* button_context_keyboard */ }; /* button_context_keyboard */
struct button_mapping button_context_bmark[] = {
{ ACTION_BMS_DELETE, BUTTON_PLAY|BUTTON_ON, BUTTON_PLAY },
{ ACTION_BMS_DELETE, BUTTON_PLAY|BUTTON_ON, BUTTON_ON },
{ ACTION_BMS_EXIT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_BMS_SELECT, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY },
LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD),
}; /* button_context_settings_bmark */
/***************************************************************************** /*****************************************************************************
* Remote control mappings * Remote control mappings
*****************************************************************************/ *****************************************************************************/
@ -242,7 +250,8 @@ const struct button_mapping* get_context_mapping( int context )
case CONTEXT_PITCHSCREEN: case CONTEXT_PITCHSCREEN:
return button_context_pitchscreen; return button_context_pitchscreen;
case CONTEXT_BOOKMARKSCREEN:
return button_context_bmark;
case CONTEXT_TREE: case CONTEXT_TREE:
if (global_settings.hold_lr_for_scroll_in_list) if (global_settings.hold_lr_for_scroll_in_list)
return button_context_tree_scroll_lr; return button_context_tree_scroll_lr;

8
apps/keymaps/keymap-x5.c
View file

@ -232,6 +232,12 @@ const struct button_mapping button_context_keyboard[] = {
LAST_ITEM_IN_LIST LAST_ITEM_IN_LIST
}; /* button_context_keyboard */ }; /* button_context_keyboard */
const struct button_mapping button_context_bmark[] = {
{ ACTION_BMS_DELETE, BUTTON_REC|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_BMS_SELECT, BUTTON_SELECT, BUTTON_NONE },
{ ACTION_BMS_EXIT, BUTTON_REC|BUTTON_REL, BUTTON_NONE },
LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS),
}; /* button_context_settings_bmark */
static const struct button_mapping* get_context_mapping_remote( int context ) static const struct button_mapping* get_context_mapping_remote( int context )
{ {
@ -277,7 +283,7 @@ const struct button_mapping* get_context_mapping( int context )
case CONTEXT_TREE: case CONTEXT_TREE:
if (global_settings.hold_lr_for_scroll_in_list) if (global_settings.hold_lr_for_scroll_in_list)
return button_context_tree_scroll_lr; return button_context_tree_scroll_lr;
/* else fall through to CUSTOM|1 */ /* 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;