diff options
author | Marcoen Hirschberg <marcoen@gmail.com> | 2007-04-13 15:42:25 +0000 |
---|---|---|
committer | Marcoen Hirschberg <marcoen@gmail.com> | 2007-04-13 15:42:25 +0000 |
commit | 5d2b1e3cb3d25a92d19bf62ce8f08f053b237ae9 (patch) | |
tree | cd69c91b505a727ac1519ec06168691d74772ab6 | |
parent | c97f0c60fd1ac240e9ba032d493cf2f3a5b226ee (diff) | |
download | rockbox-5d2b1e3cb3d25a92d19bf62ce8f08f053b237ae9.tar.gz rockbox-5d2b1e3cb3d25a92d19bf62ce8f08f053b237ae9.zip |
rename ACTION_WPSAB_RESET to ACTION_WPS_ABRESET to be more consistent with the rest
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13142 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/action.h | 2 | ||||
-rw-r--r-- | apps/gui/gwps.c | 4 | ||||
-rw-r--r-- | apps/keymaps/keymap-av300.c | 2 | ||||
-rw-r--r-- | apps/keymaps/keymap-e200.c | 2 | ||||
-rw-r--r-- | apps/keymaps/keymap-gigabeat.c | 2 | ||||
-rw-r--r-- | apps/keymaps/keymap-h10.c | 2 | ||||
-rw-r--r-- | apps/keymaps/keymap-h1x0_h3x0.c | 6 | ||||
-rw-r--r-- | apps/keymaps/keymap-ifp7xx.c | 2 | ||||
-rw-r--r-- | apps/keymaps/keymap-recorder.c | 2 |
9 files changed, 12 insertions, 12 deletions
diff --git a/apps/action.h b/apps/action.h index 29023720cc..85ad48592b 100644 --- a/apps/action.h +++ b/apps/action.h | |||
@@ -118,7 +118,7 @@ enum { | |||
118 | #endif | 118 | #endif |
119 | ACTION_WPS_ABSETA_PREVDIR, /* these should be safe to put together seen as */ | 119 | ACTION_WPS_ABSETA_PREVDIR, /* these should be safe to put together seen as */ |
120 | ACTION_WPS_ABSETB_NEXTDIR, /* you shouldnt want to change dir in ab-mode */ | 120 | ACTION_WPS_ABSETB_NEXTDIR, /* you shouldnt want to change dir in ab-mode */ |
121 | ACTION_WPSAB_RESET, | 121 | ACTION_WPS_ABRESET, |
122 | 122 | ||
123 | /* list and tree page up/down */ | 123 | /* list and tree page up/down */ |
124 | ACTION_LISTTREE_PGUP,/* optional */ | 124 | ACTION_LISTTREE_PGUP,/* optional */ |
diff --git a/apps/gui/gwps.c b/apps/gui/gwps.c index 24cf24dbe0..6bf584fc6a 100644 --- a/apps/gui/gwps.c +++ b/apps/gui/gwps.c | |||
@@ -222,7 +222,7 @@ long gui_wps_show(void) | |||
222 | button = ACTION_WPS_ABSETB_NEXTDIR; | 222 | button = ACTION_WPS_ABSETB_NEXTDIR; |
223 | break; | 223 | break; |
224 | case 2: | 224 | case 2: |
225 | button = ACTION_WPSAB_RESET; | 225 | button = ACTION_WPS_ABRESET; |
226 | break; | 226 | break; |
227 | } | 227 | } |
228 | wps_ab_state = (wps_ab_state+1) % 3; | 228 | wps_ab_state = (wps_ab_state+1) % 3; |
@@ -552,7 +552,7 @@ long gui_wps_show(void) | |||
552 | 552 | ||
553 | #ifdef AB_REPEAT_ENABLE | 553 | #ifdef AB_REPEAT_ENABLE |
554 | /* reset A&B markers */ | 554 | /* reset A&B markers */ |
555 | case ACTION_WPSAB_RESET: | 555 | case ACTION_WPS_ABRESET: |
556 | if (ab_repeat_mode_enabled()) | 556 | if (ab_repeat_mode_enabled()) |
557 | { | 557 | { |
558 | ab_reset_markers(); | 558 | ab_reset_markers(); |
diff --git a/apps/keymaps/keymap-av300.c b/apps/keymaps/keymap-av300.c index f390b84b92..e451d708cf 100644 --- a/apps/keymaps/keymap-av300.c +++ b/apps/keymaps/keymap-av300.c | |||
@@ -80,7 +80,7 @@ static const struct button_mapping button_context_wps[] = { | |||
80 | { ACTION_F3, BUTTON_F3, BUTTON_NONE }, | 80 | { ACTION_F3, BUTTON_F3, BUTTON_NONE }, |
81 | { ACTION_WPS_ABSETB_NEXTDIR, BUTTON_ON|BUTTON_RIGHT, BUTTON_NONE }, | 81 | { ACTION_WPS_ABSETB_NEXTDIR, BUTTON_ON|BUTTON_RIGHT, BUTTON_NONE }, |
82 | { ACTION_WPS_ABSETA_PREVDIR, BUTTON_ON|BUTTON_LEFT, BUTTON_NONE }, | 82 | { ACTION_WPS_ABSETA_PREVDIR, BUTTON_ON|BUTTON_LEFT, BUTTON_NONE }, |
83 | { ACTION_WPSAB_RESET, BUTTON_ON|BUTTON_OFF, BUTTON_ON }, | 83 | { ACTION_WPS_ABRESET, BUTTON_ON|BUTTON_OFF, BUTTON_ON }, |
84 | 84 | ||
85 | 85 | ||
86 | LAST_ITEM_IN_LIST | 86 | LAST_ITEM_IN_LIST |
diff --git a/apps/keymaps/keymap-e200.c b/apps/keymaps/keymap-e200.c index 6bbad1a86c..8e11cadb8b 100644 --- a/apps/keymaps/keymap-e200.c +++ b/apps/keymaps/keymap-e200.c | |||
@@ -63,7 +63,7 @@ static const struct button_mapping button_context_wps[] = { | |||
63 | 63 | ||
64 | { ACTION_WPS_ABSETB_NEXTDIR, BUTTON_POWER|BUTTON_RIGHT, BUTTON_POWER }, | 64 | { ACTION_WPS_ABSETB_NEXTDIR, BUTTON_POWER|BUTTON_RIGHT, BUTTON_POWER }, |
65 | { ACTION_WPS_ABSETA_PREVDIR, BUTTON_POWER|BUTTON_LEFT, BUTTON_POWER }, | 65 | { ACTION_WPS_ABSETA_PREVDIR, BUTTON_POWER|BUTTON_LEFT, BUTTON_POWER }, |
66 | { ACTION_WPSAB_RESET, BUTTON_POWER|BUTTON_UP, BUTTON_POWER }, | 66 | { ACTION_WPS_ABRESET, BUTTON_POWER|BUTTON_UP, BUTTON_POWER }, |
67 | 67 | ||
68 | { ACTION_WPS_VOLUP, BUTTON_SCROLL_DOWN, BUTTON_NONE }, | 68 | { ACTION_WPS_VOLUP, BUTTON_SCROLL_DOWN, BUTTON_NONE }, |
69 | { ACTION_WPS_VOLUP, BUTTON_SCROLL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 69 | { ACTION_WPS_VOLUP, BUTTON_SCROLL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
diff --git a/apps/keymaps/keymap-gigabeat.c b/apps/keymaps/keymap-gigabeat.c index 56fb8de24f..f1bcc33591 100644 --- a/apps/keymaps/keymap-gigabeat.c +++ b/apps/keymaps/keymap-gigabeat.c | |||
@@ -91,7 +91,7 @@ static const struct button_mapping button_context_wps[] = { | |||
91 | { ACTION_WPS_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, | 91 | { ACTION_WPS_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, |
92 | { ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, | 92 | { ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, |
93 | { ACTION_WPS_BROWSE, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, | 93 | { ACTION_WPS_BROWSE, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, |
94 | { ACTION_WPSAB_RESET, BUTTON_POWER|BUTTON_SELECT, BUTTON_POWER }, | 94 | { ACTION_WPS_ABRESET, BUTTON_POWER|BUTTON_SELECT, BUTTON_POWER }, |
95 | { ACTION_WPS_ID3SCREEN, BUTTON_POWER|BUTTON_MENU, BUTTON_NONE }, | 95 | { ACTION_WPS_ID3SCREEN, BUTTON_POWER|BUTTON_MENU, BUTTON_NONE }, |
96 | 96 | ||
97 | LAST_ITEM_IN_LIST | 97 | LAST_ITEM_IN_LIST |
diff --git a/apps/keymaps/keymap-h10.c b/apps/keymaps/keymap-h10.c index be3dc74b04..1a3c81b989 100644 --- a/apps/keymaps/keymap-h10.c +++ b/apps/keymaps/keymap-h10.c | |||
@@ -74,7 +74,7 @@ static const struct button_mapping button_context_wps[] = { | |||
74 | 74 | ||
75 | { ACTION_WPS_ABSETB_NEXTDIR, BUTTON_POWER|BUTTON_FF, BUTTON_POWER }, | 75 | { ACTION_WPS_ABSETB_NEXTDIR, BUTTON_POWER|BUTTON_FF, BUTTON_POWER }, |
76 | { ACTION_WPS_ABSETA_PREVDIR, BUTTON_POWER|BUTTON_REW, BUTTON_POWER }, | 76 | { ACTION_WPS_ABSETA_PREVDIR, BUTTON_POWER|BUTTON_REW, BUTTON_POWER }, |
77 | { ACTION_WPSAB_RESET, BUTTON_POWER|BUTTON_PLAY, BUTTON_POWER }, | 77 | { ACTION_WPS_ABRESET, BUTTON_POWER|BUTTON_PLAY, BUTTON_POWER }, |
78 | 78 | ||
79 | { ACTION_WPS_VOLDOWN, BUTTON_SCROLL_DOWN, BUTTON_NONE }, | 79 | { ACTION_WPS_VOLDOWN, BUTTON_SCROLL_DOWN, BUTTON_NONE }, |
80 | { ACTION_WPS_VOLDOWN, BUTTON_SCROLL_DOWN|BUTTON_REPEAT,BUTTON_NONE }, | 80 | { ACTION_WPS_VOLDOWN, BUTTON_SCROLL_DOWN|BUTTON_REPEAT,BUTTON_NONE }, |
diff --git a/apps/keymaps/keymap-h1x0_h3x0.c b/apps/keymaps/keymap-h1x0_h3x0.c index 8413d09ce6..bbec420846 100644 --- a/apps/keymaps/keymap-h1x0_h3x0.c +++ b/apps/keymaps/keymap-h1x0_h3x0.c | |||
@@ -86,7 +86,7 @@ static const struct button_mapping button_context_wps[] = { | |||
86 | { ACTION_WPS_MENU, BUTTON_MODE|BUTTON_REL, BUTTON_MODE }, | 86 | { ACTION_WPS_MENU, BUTTON_MODE|BUTTON_REL, BUTTON_MODE }, |
87 | { ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, | 87 | { ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, |
88 | { ACTION_WPS_BROWSE, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, | 88 | { ACTION_WPS_BROWSE, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, |
89 | { ACTION_WPSAB_RESET, BUTTON_ON|BUTTON_SELECT, BUTTON_ON }, | 89 | { ACTION_WPS_ABRESET, BUTTON_ON|BUTTON_SELECT, BUTTON_ON }, |
90 | { ACTION_WPS_ID3SCREEN, BUTTON_ON|BUTTON_MODE, BUTTON_NONE }, | 90 | { ACTION_WPS_ID3SCREEN, BUTTON_ON|BUTTON_MODE, BUTTON_NONE }, |
91 | 91 | ||
92 | LAST_ITEM_IN_LIST | 92 | LAST_ITEM_IN_LIST |
@@ -348,12 +348,12 @@ static const struct button_mapping button_context_wps_remotescommon[] = { | |||
348 | 348 | ||
349 | 349 | ||
350 | static const struct button_mapping button_context_wps_h100remote[] = { | 350 | static const struct button_mapping button_context_wps_h100remote[] = { |
351 | { ACTION_WPSAB_RESET, BUTTON_RC_ON|BUTTON_RC_MENU, BUTTON_RC_ON }, | 351 | { ACTION_WPS_ABRESET, BUTTON_RC_ON|BUTTON_RC_MENU, BUTTON_RC_ON }, |
352 | { ACTION_WPS_ID3SCREEN, BUTTON_RC_ON|BUTTON_RC_MODE, BUTTON_NONE }, | 352 | { ACTION_WPS_ID3SCREEN, BUTTON_RC_ON|BUTTON_RC_MODE, BUTTON_NONE }, |
353 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | 353 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
354 | }; | 354 | }; |
355 | static const struct button_mapping button_context_wps_h300lcdremote[] = { | 355 | static const struct button_mapping button_context_wps_h300lcdremote[] = { |
356 | { ACTION_WPSAB_RESET, BUTTON_RC_MENU|BUTTON_RC_ON, BUTTON_RC_MENU }, | 356 | { ACTION_WPS_ABRESET, BUTTON_RC_MENU|BUTTON_RC_ON, BUTTON_RC_MENU }, |
357 | { ACTION_WPS_ID3SCREEN, BUTTON_RC_MENU|BUTTON_RC_MODE, BUTTON_NONE }, | 357 | { ACTION_WPS_ID3SCREEN, BUTTON_RC_MENU|BUTTON_RC_MODE, BUTTON_NONE }, |
358 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | 358 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
359 | }; | 359 | }; |
diff --git a/apps/keymaps/keymap-ifp7xx.c b/apps/keymaps/keymap-ifp7xx.c index 6f12ac14c8..93de23b372 100644 --- a/apps/keymaps/keymap-ifp7xx.c +++ b/apps/keymaps/keymap-ifp7xx.c | |||
@@ -65,7 +65,7 @@ static const struct button_mapping button_context_wps[] = { | |||
65 | { ACTION_WPS_MENU, BUTTON_MODE|BUTTON_REL, BUTTON_MODE }, | 65 | { ACTION_WPS_MENU, BUTTON_MODE|BUTTON_REL, BUTTON_MODE }, |
66 | { ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, | 66 | { ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, |
67 | { ACTION_WPS_BROWSE, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, | 67 | { ACTION_WPS_BROWSE, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, |
68 | { ACTION_WPSAB_RESET, BUTTON_PLAY|BUTTON_SELECT, BUTTON_PLAY }, | 68 | { ACTION_WPS_ABRESET, BUTTON_PLAY|BUTTON_SELECT, BUTTON_PLAY }, |
69 | { ACTION_WPS_ID3SCREEN, BUTTON_PLAY|BUTTON_MODE, BUTTON_PLAY }, | 69 | { ACTION_WPS_ID3SCREEN, BUTTON_PLAY|BUTTON_MODE, BUTTON_PLAY }, |
70 | 70 | ||
71 | LAST_ITEM_IN_LIST | 71 | LAST_ITEM_IN_LIST |
diff --git a/apps/keymaps/keymap-recorder.c b/apps/keymaps/keymap-recorder.c index 6f9aff635a..3dd8bbdd87 100644 --- a/apps/keymaps/keymap-recorder.c +++ b/apps/keymaps/keymap-recorder.c | |||
@@ -80,7 +80,7 @@ static const struct button_mapping button_context_wps[] = { | |||
80 | { ACTION_F3, BUTTON_F3, BUTTON_NONE }, | 80 | { ACTION_F3, BUTTON_F3, BUTTON_NONE }, |
81 | { ACTION_WPS_ABSETB_NEXTDIR, BUTTON_ON|BUTTON_RIGHT, BUTTON_NONE }, | 81 | { ACTION_WPS_ABSETB_NEXTDIR, BUTTON_ON|BUTTON_RIGHT, BUTTON_NONE }, |
82 | { ACTION_WPS_ABSETA_PREVDIR, BUTTON_ON|BUTTON_LEFT, BUTTON_NONE }, | 82 | { ACTION_WPS_ABSETA_PREVDIR, BUTTON_ON|BUTTON_LEFT, BUTTON_NONE }, |
83 | { ACTION_WPSAB_RESET, BUTTON_ON|BUTTON_OFF, BUTTON_ON }, | 83 | { ACTION_WPS_ABRESET, BUTTON_ON|BUTTON_OFF, BUTTON_ON }, |
84 | 84 | ||
85 | 85 | ||
86 | LAST_ITEM_IN_LIST | 86 | LAST_ITEM_IN_LIST |