From 650a2941fdb02e2c8379ea25e4bf1b6154e660c4 Mon Sep 17 00:00:00 2001 From: Marcin Bukat Date: Tue, 2 Nov 2010 10:51:04 +0000 Subject: [PATCH] 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 --- bootloader/mpio_hd200.c | 10 +++++----- 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) printf("========================="); printf(""); - printf(" [FF] [PREV] to move "); + printf(" [FF] [REW] to move "); printf(" [PLAY] to confirm "); /* content of menu and keys handling */ @@ -262,16 +262,16 @@ static void bootmenu(void) switch (button) { - case BUTTON_PREV: - case BUTTON_RC_PREV: + case BUTTON_REW: + case BUTTON_RC_REW: if (option > rockbox) option--; else option = shutdown; break; - case BUTTON_NEXT: - case BUTTON_RC_NEXT: + case BUTTON_FF: + case BUTTON_RC_FF: if (option < shutdown) option++; 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) switch (keyboard_button) { case SDLK_UP: - new_btn = BUTTON_PREV; + new_btn = BUTTON_REW; break; case SDLK_DOWN: - new_btn = BUTTON_NEXT; + new_btn = BUTTON_FF; break; case SDLK_SPACE: - new_btn = BUTTON_SELECT; + new_btn = BUTTON_FUNC; break; case SDLK_RETURN: case SDLK_p: @@ -61,7 +61,7 @@ struct button_map bm[] = { { SDLK_RETURN, 369, 305, 20, "Play/Stop" }, { SDLK_UP, 353, 168, 10, "Rew" }, { SDLK_DOWN, 353, 198, 10, "FF" }, - { SDLK_SPACE, 353, 186, 10, "Select" }, + { SDLK_SPACE, 353, 186, 10, "Func" }, { SDLK_LEFT, 123, 67, 20, "Vol Down" }, { SDLK_RIGHT, 206, 67, 20, "Vol Up" }, { SDLK_h, 369, 402, 30, "Hold" },