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

Bookmark support for I-river remotes, also renamed bookmark delete button as it has changed to RECORD - Sorry Linus ;)

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10643 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Martin Scarratt 2006-08-18 09:31:00 +00:00
parent 32dd5e9755
commit c341da2385
2 changed files with 57 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -254,6 +254,26 @@ const struct button_mapping button_context_settings_h100lcdremote[] = {
LAST_ITEM_IN_LIST LAST_ITEM_IN_LIST
};/* button_context_settings_h100lcdremote */ };/* button_context_settings_h100lcdremote */
const struct button_mapping button_context_settingsgraphical_h100lcdremote[] = {
{ ACTION_SETTINGS_INC, BUTTON_RC_FF, BUTTON_NONE },
{ ACTION_SETTINGS_INCREPEAT, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_SETTINGS_DEC, BUTTON_RC_REW, BUTTON_NONE },
{ ACTION_SETTINGS_DECREPEAT, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_STD_PREV, BUTTON_RC_VOL_UP, BUTTON_NONE },
{ ACTION_STD_PREVREPEAT, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_STD_NEXT, BUTTON_RC_VOL_DOWN, BUTTON_NONE },
{ ACTION_STD_NEXTREPEAT, BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE },
LAST_ITEM_IN_LIST
}; /* button_context_settingsgraphical */
const struct button_mapping button_context_bmark_h100lcdremote[] = {
{ ACTION_BMARK_DELETE, BUTTON_RC_REC, BUTTON_NONE },
{ ACTION_STD_OK, BUTTON_RC_MENU, BUTTON_NONE },
LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGSGRAPHICAL),
}; /* button_context_settings_bmark */
/********* H300 LCD remote ******/ /********* H300 LCD remote ******/
const struct button_mapping button_context_standard_h300lcdremote[] = { const struct button_mapping button_context_standard_h300lcdremote[] = {
@ -292,6 +312,25 @@ const struct button_mapping button_context_listtree_h300lcdremote[] = {
}; /* button_context_listtree_h300lcdremote */ }; /* button_context_listtree_h300lcdremote */
const struct button_mapping button_context_settingsgraphical_h300lcdremote[] = {
{ ACTION_SETTINGS_INC, BUTTON_RC_FF, BUTTON_NONE },
{ ACTION_SETTINGS_INCREPEAT, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_SETTINGS_DEC, BUTTON_RC_REW, BUTTON_NONE },
{ ACTION_SETTINGS_DECREPEAT, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_STD_PREV, BUTTON_RC_VOL_UP, BUTTON_NONE },
{ ACTION_STD_PREVREPEAT, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_STD_NEXT, BUTTON_RC_VOL_DOWN, BUTTON_NONE },
{ ACTION_STD_NEXTREPEAT, BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE },
LAST_ITEM_IN_LIST
}; /* button_context_settingsgraphical */
const struct button_mapping button_context_bmark_h300lcdremote[] = {
{ ACTION_BMARK_DELETE, BUTTON_RC_REC, BUTTON_NONE },
{ ACTION_STD_OK, BUTTON_RC_MENU, BUTTON_NONE },
LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGSGRAPHICAL),
}; /* button_context_settings_bmark */
const struct button_mapping *button_context_settings_h300lcdremote = const struct button_mapping *button_context_settings_h300lcdremote =
button_context_settings_h100lcdremote; button_context_settings_h100lcdremote;
/* FIXME: non lcd remotes need mappings.. ?? */ /* FIXME: non lcd remotes need mappings.. ?? */
@ -306,7 +345,10 @@ static const struct button_mapping
*remote_button_context_std = button_context_standard_h100lcdremote, *remote_button_context_std = button_context_standard_h100lcdremote,
*remote_button_context_wps = button_context_wps_h100lcdremote, *remote_button_context_wps = button_context_wps_h100lcdremote,
*remote_button_context_listtree = button_context_listtree_h100lcdremote, *remote_button_context_listtree = button_context_listtree_h100lcdremote,
*remote_button_context_settings = button_context_settings_h100lcdremote; *remote_button_context_settings = button_context_settings_h100lcdremote,
*remote_button_context_settingsgraphical = button_context_settingsgraphical_h100lcdremote,
*remote_button_context_bmark = button_context_bmark_h100lcdremote;
static int _remote_type = 0; static int _remote_type = 0;
static void remap_remote(void) static void remap_remote(void)
@ -319,24 +361,32 @@ static void remap_remote(void)
remote_button_context_wps = NULL; remote_button_context_wps = NULL;
remote_button_context_listtree = NULL; remote_button_context_listtree = NULL;
remote_button_context_settings = NULL; remote_button_context_settings = NULL;
remote_button_context_settingsgraphical = NULL;
remote_button_context_bmark = NULL;
break; break;
case REMOTETYPE_H100_LCD: case REMOTETYPE_H100_LCD:
remote_button_context_std = button_context_standard_h100lcdremote; remote_button_context_std = button_context_standard_h100lcdremote;
remote_button_context_wps = button_context_wps_h100lcdremote; remote_button_context_wps = button_context_wps_h100lcdremote;
remote_button_context_listtree = button_context_listtree_h100lcdremote; remote_button_context_listtree = button_context_listtree_h100lcdremote;
remote_button_context_settings = button_context_settings_h100lcdremote; remote_button_context_settings = button_context_settings_h100lcdremote;
remote_button_context_settingsgraphical = button_context_settingsgraphical_h100lcdremote;
remote_button_context_bmark = button_context_bmark_h100lcdremote;
break; break;
case REMOTETYPE_H300_LCD: case REMOTETYPE_H300_LCD:
remote_button_context_std = button_context_standard_h300lcdremote; remote_button_context_std = button_context_standard_h300lcdremote;
remote_button_context_wps = button_context_wps_h300lcdremote; remote_button_context_wps = button_context_wps_h300lcdremote;
remote_button_context_listtree = button_context_listtree_h300lcdremote; remote_button_context_listtree = button_context_listtree_h300lcdremote;
remote_button_context_settings = button_context_settings_h300lcdremote; remote_button_context_settings = button_context_settings_h300lcdremote;
remote_button_context_settingsgraphical = button_context_settingsgraphical_h300lcdremote;
remote_button_context_bmark = button_context_bmark_h300lcdremote;
break; break;
case REMOTETYPE_H300_NONLCD: /* FIXME: add its tables */ case REMOTETYPE_H300_NONLCD: /* FIXME: add its tables */
remote_button_context_std = button_context_standard_h300lcdremote; remote_button_context_std = button_context_standard_h300lcdremote;
remote_button_context_wps = button_context_wps_h300lcdremote; remote_button_context_wps = button_context_wps_h300lcdremote;
remote_button_context_listtree = button_context_listtree_h300lcdremote; remote_button_context_listtree = button_context_listtree_h300lcdremote;
remote_button_context_settings = button_context_settings_h300lcdremote; remote_button_context_settings = button_context_settings_h300lcdremote;
remote_button_context_settingsgraphical = button_context_settingsgraphical_h300lcdremote;
remote_button_context_bmark = button_context_bmark_h300lcdremote;
break; break;
} }
} }
@ -366,10 +416,12 @@ const struct button_mapping* get_context_mapping_remote(int context)
case CONTEXT_TREE: case CONTEXT_TREE:
case CONTEXT_LIST: case CONTEXT_LIST:
return remote_button_context_listtree; return remote_button_context_listtree;
case CONTEXT_SETTINGSGRAPHICAL:
return remote_button_context_settingsgraphical;
case CONTEXT_BOOKMARKSCREEN:
return remote_button_context_bmark;
case CONTEXT_YESNOSCREEN: case CONTEXT_YESNOSCREEN:
case CONTEXT_BOOKMARKSCREEN:
; /* fall out of the switch */ ; /* fall out of the switch */
} }
return remote_button_context_std; return remote_button_context_std;

5
apps/lang/english.lang
View file

@ -4775,11 +4775,10 @@
desc: Used on the bookmark select window to indicated the bookmark delete option desc: Used on the bookmark select window to indicated the bookmark delete option
user: user:
<source> <source>
*: "ON+Play = Delete" *: "RECORD = Delete"
</source> </source>
<dest> <dest>
*: "ON+Play = Delete" *: "RECORD = Delete"
h100,h120,h300: "ON+NAVI = Delete"
</dest> </dest>
<voice> <voice>
*: "" *: ""