diff options
author | Marcin Bukat <marcin.bukat@gmail.com> | 2010-11-02 10:51:04 +0000 |
---|---|---|
committer | Marcin Bukat <marcin.bukat@gmail.com> | 2010-11-02 10:51:04 +0000 |
commit | 650a2941fdb02e2c8379ea25e4bf1b6154e660c4 (patch) | |
tree | a0b7ce4af5282863efafad566d858dab25864ce0 | |
parent | 59ba8fea22dad7c998fe515dafeb15b0e91ddbc0 (diff) | |
download | rockbox-650a2941fdb02e2c8379ea25e4bf1b6154e660c4.tar.gz rockbox-650a2941fdb02e2c8379ea25e4bf1b6154e660c4.zip |
MPIO HD200: fix red (I missed bootloader and simulator when renaming buttons)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28444 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | bootloader/mpio_hd200.c | 10 | ||||
-rw-r--r-- | uisimulator/buttonmap/mpio-hd200.c | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/bootloader/mpio_hd200.c b/bootloader/mpio_hd200.c index 65bc5be4a4..98c83239f7 100644 --- a/bootloader/mpio_hd200.c +++ b/bootloader/mpio_hd200.c | |||
@@ -233,7 +233,7 @@ static void bootmenu(void) | |||
233 | 233 | ||
234 | printf("========================="); | 234 | printf("========================="); |
235 | printf(""); | 235 | printf(""); |
236 | printf(" [FF] [PREV] to move "); | 236 | printf(" [FF] [REW] to move "); |
237 | printf(" [PLAY] to confirm "); | 237 | printf(" [PLAY] to confirm "); |
238 | 238 | ||
239 | /* content of menu and keys handling */ | 239 | /* content of menu and keys handling */ |
@@ -262,16 +262,16 @@ static void bootmenu(void) | |||
262 | 262 | ||
263 | switch (button) | 263 | switch (button) |
264 | { | 264 | { |
265 | case BUTTON_PREV: | 265 | case BUTTON_REW: |
266 | case BUTTON_RC_PREV: | 266 | case BUTTON_RC_REW: |
267 | if (option > rockbox) | 267 | if (option > rockbox) |
268 | option--; | 268 | option--; |
269 | else | 269 | else |
270 | option = shutdown; | 270 | option = shutdown; |
271 | break; | 271 | break; |
272 | 272 | ||
273 | case BUTTON_NEXT: | 273 | case BUTTON_FF: |
274 | case BUTTON_RC_NEXT: | 274 | case BUTTON_RC_FF: |
275 | if (option < shutdown) | 275 | if (option < shutdown) |
276 | option++; | 276 | option++; |
277 | else | 277 | else |
diff --git a/uisimulator/buttonmap/mpio-hd200.c b/uisimulator/buttonmap/mpio-hd200.c index 7b200394fd..291af0f545 100644 --- a/uisimulator/buttonmap/mpio-hd200.c +++ b/uisimulator/buttonmap/mpio-hd200.c | |||
@@ -30,13 +30,13 @@ int key_to_button(int keyboard_button) | |||
30 | switch (keyboard_button) | 30 | switch (keyboard_button) |
31 | { | 31 | { |
32 | case SDLK_UP: | 32 | case SDLK_UP: |
33 | new_btn = BUTTON_PREV; | 33 | new_btn = BUTTON_REW; |
34 | break; | 34 | break; |
35 | case SDLK_DOWN: | 35 | case SDLK_DOWN: |
36 | new_btn = BUTTON_NEXT; | 36 | new_btn = BUTTON_FF; |
37 | break; | 37 | break; |
38 | case SDLK_SPACE: | 38 | case SDLK_SPACE: |
39 | new_btn = BUTTON_SELECT; | 39 | new_btn = BUTTON_FUNC; |
40 | break; | 40 | break; |
41 | case SDLK_RETURN: | 41 | case SDLK_RETURN: |
42 | case SDLK_p: | 42 | case SDLK_p: |
@@ -61,7 +61,7 @@ struct button_map bm[] = { | |||
61 | { SDLK_RETURN, 369, 305, 20, "Play/Stop" }, | 61 | { SDLK_RETURN, 369, 305, 20, "Play/Stop" }, |
62 | { SDLK_UP, 353, 168, 10, "Rew" }, | 62 | { SDLK_UP, 353, 168, 10, "Rew" }, |
63 | { SDLK_DOWN, 353, 198, 10, "FF" }, | 63 | { SDLK_DOWN, 353, 198, 10, "FF" }, |
64 | { SDLK_SPACE, 353, 186, 10, "Select" }, | 64 | { SDLK_SPACE, 353, 186, 10, "Func" }, |
65 | { SDLK_LEFT, 123, 67, 20, "Vol Down" }, | 65 | { SDLK_LEFT, 123, 67, 20, "Vol Down" }, |
66 | { SDLK_RIGHT, 206, 67, 20, "Vol Up" }, | 66 | { SDLK_RIGHT, 206, 67, 20, "Vol Up" }, |
67 | { SDLK_h, 369, 402, 30, "Hold" }, | 67 | { SDLK_h, 369, 402, 30, "Hold" }, |