Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

rename ACTION_WPSAB_RESET to ACTION_WPS_ABRESET to be more consistent with the rest

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13142 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Marcoen Hirschberg 2007-04-13 15:42:25 +00:00
parent c97f0c60fd
commit 5d2b1e3cb3
9 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/action.h
View file

@ -118,7 +118,7 @@ enum {
#endif
ACTION_WPS_ABSETA_PREVDIR, /* these should be safe to put together seen as */
ACTION_WPS_ABSETB_NEXTDIR, /* you shouldnt want to change dir in ab-mode */
ACTION_WPSAB_RESET,
ACTION_WPS_ABRESET,
/* list and tree page up/down */
ACTION_LISTTREE_PGUP,/* optional */

4
apps/gui/gwps.c
View file

@ -222,7 +222,7 @@ long gui_wps_show(void)
button = ACTION_WPS_ABSETB_NEXTDIR;
break;
case 2:
button = ACTION_WPSAB_RESET;
button = ACTION_WPS_ABRESET;
break;
}
wps_ab_state = (wps_ab_state+1) % 3;
@ -552,7 +552,7 @@ long gui_wps_show(void)
#ifdef AB_REPEAT_ENABLE
/* reset A&B markers */
case ACTION_WPSAB_RESET:
case ACTION_WPS_ABRESET:
if (ab_repeat_mode_enabled())
{
ab_reset_markers();

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

@ -80,7 +80,7 @@ static const struct button_mapping button_context_wps[] = {
{ ACTION_F3, BUTTON_F3, BUTTON_NONE },
{ ACTION_WPS_ABSETB_NEXTDIR, BUTTON_ON|BUTTON_RIGHT, BUTTON_NONE },
{ ACTION_WPS_ABSETA_PREVDIR, BUTTON_ON|BUTTON_LEFT, BUTTON_NONE },
{ ACTION_WPSAB_RESET, BUTTON_ON|BUTTON_OFF, BUTTON_ON },
{ ACTION_WPS_ABRESET, BUTTON_ON|BUTTON_OFF, BUTTON_ON },
LAST_ITEM_IN_LIST

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

@ -63,7 +63,7 @@ static const struct button_mapping button_context_wps[] = {
{ ACTION_WPS_ABSETB_NEXTDIR, BUTTON_POWER|BUTTON_RIGHT, BUTTON_POWER },
{ ACTION_WPS_ABSETA_PREVDIR, BUTTON_POWER|BUTTON_LEFT, BUTTON_POWER },
{ ACTION_WPSAB_RESET, BUTTON_POWER|BUTTON_UP, BUTTON_POWER },
{ ACTION_WPS_ABRESET, BUTTON_POWER|BUTTON_UP, BUTTON_POWER },
{ ACTION_WPS_VOLUP, BUTTON_SCROLL_DOWN, BUTTON_NONE },
{ ACTION_WPS_VOLUP, BUTTON_SCROLL_DOWN|BUTTON_REPEAT, BUTTON_NONE },

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

@ -91,7 +91,7 @@ static const struct button_mapping button_context_wps[] = {
{ ACTION_WPS_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU },
{ ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT },
{ ACTION_WPS_BROWSE, BUTTON_POWER|BUTTON_REL, BUTTON_POWER },
{ ACTION_WPSAB_RESET, BUTTON_POWER|BUTTON_SELECT, BUTTON_POWER },
{ ACTION_WPS_ABRESET, BUTTON_POWER|BUTTON_SELECT, BUTTON_POWER },
{ ACTION_WPS_ID3SCREEN, BUTTON_POWER|BUTTON_MENU, BUTTON_NONE },
LAST_ITEM_IN_LIST

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

@ -74,7 +74,7 @@ static const struct button_mapping button_context_wps[] = {
{ ACTION_WPS_ABSETB_NEXTDIR, BUTTON_POWER|BUTTON_FF, BUTTON_POWER },
{ ACTION_WPS_ABSETA_PREVDIR, BUTTON_POWER|BUTTON_REW, BUTTON_POWER },
{ ACTION_WPSAB_RESET, BUTTON_POWER|BUTTON_PLAY, BUTTON_POWER },
{ ACTION_WPS_ABRESET, BUTTON_POWER|BUTTON_PLAY, BUTTON_POWER },
{ ACTION_WPS_VOLDOWN, BUTTON_SCROLL_DOWN, BUTTON_NONE },
{ ACTION_WPS_VOLDOWN, BUTTON_SCROLL_DOWN|BUTTON_REPEAT,BUTTON_NONE },

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

@ -86,7 +86,7 @@ static const struct button_mapping button_context_wps[] = {
{ ACTION_WPS_MENU, BUTTON_MODE|BUTTON_REL, BUTTON_MODE },
{ ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT },
{ ACTION_WPS_BROWSE, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT },
{ ACTION_WPSAB_RESET, BUTTON_ON|BUTTON_SELECT, BUTTON_ON },
{ ACTION_WPS_ABRESET, BUTTON_ON|BUTTON_SELECT, BUTTON_ON },
{ ACTION_WPS_ID3SCREEN, BUTTON_ON|BUTTON_MODE, BUTTON_NONE },
LAST_ITEM_IN_LIST
@ -348,12 +348,12 @@ static const struct button_mapping button_context_wps_remotescommon[] = {
static const struct button_mapping button_context_wps_h100remote[] = {
{ ACTION_WPSAB_RESET, BUTTON_RC_ON|BUTTON_RC_MENU, BUTTON_RC_ON },
{ ACTION_WPS_ABRESET, BUTTON_RC_ON|BUTTON_RC_MENU, BUTTON_RC_ON },
{ ACTION_WPS_ID3SCREEN, BUTTON_RC_ON|BUTTON_RC_MODE, BUTTON_NONE },
LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
};
static const struct button_mapping button_context_wps_h300lcdremote[] = {
{ ACTION_WPSAB_RESET, BUTTON_RC_MENU|BUTTON_RC_ON, BUTTON_RC_MENU },
{ ACTION_WPS_ABRESET, BUTTON_RC_MENU|BUTTON_RC_ON, BUTTON_RC_MENU },
{ ACTION_WPS_ID3SCREEN, BUTTON_RC_MENU|BUTTON_RC_MODE, BUTTON_NONE },
LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
};

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

@ -65,7 +65,7 @@ static const struct button_mapping button_context_wps[] = {
{ ACTION_WPS_MENU, BUTTON_MODE|BUTTON_REL, BUTTON_MODE },
{ ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT },
{ ACTION_WPS_BROWSE, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT },
{ ACTION_WPSAB_RESET, BUTTON_PLAY|BUTTON_SELECT, BUTTON_PLAY },
{ ACTION_WPS_ABRESET, BUTTON_PLAY|BUTTON_SELECT, BUTTON_PLAY },
{ ACTION_WPS_ID3SCREEN, BUTTON_PLAY|BUTTON_MODE, BUTTON_PLAY },
LAST_ITEM_IN_LIST

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

@ -80,7 +80,7 @@ static const struct button_mapping button_context_wps[] = {
{ ACTION_F3, BUTTON_F3, BUTTON_NONE },
{ ACTION_WPS_ABSETB_NEXTDIR, BUTTON_ON|BUTTON_RIGHT, BUTTON_NONE },
{ ACTION_WPS_ABSETA_PREVDIR, BUTTON_ON|BUTTON_LEFT, BUTTON_NONE },
{ ACTION_WPSAB_RESET, BUTTON_ON|BUTTON_OFF, BUTTON_ON },
{ ACTION_WPS_ABRESET, BUTTON_ON|BUTTON_OFF, BUTTON_ON },
LAST_ITEM_IN_LIST