diff options
author | Amaury Pouly <amaury.pouly@gmail.com> | 2016-09-20 23:59:40 +0100 |
---|---|---|
committer | Amaury Pouly <amaury.pouly@gmail.com> | 2016-09-21 00:29:42 +0100 |
commit | 5918e18e816e23fa9c097d0e8cf0a5813538018b (patch) | |
tree | 64186bfe3d0332abe2c5c3d80f1f5e4900a88775 | |
parent | 9dc4b00df1a997e8b9223c040c27392d1d2151e3 (diff) | |
download | rockbox-5918e18e816e23fa9c097d0e8cf0a5813538018b.tar.gz rockbox-5918e18e816e23fa9c097d0e8cf0a5813538018b.zip |
zenxfi3: fix recording keymap and simulator keymap
Change-Id: I246834b5244d4e0f672633d2960db45278e12ec4
-rw-r--r-- | apps/keymaps/keymap-zenxfi3.c | 9 | ||||
-rw-r--r-- | uisimulator/buttonmap/creative-zenxfi3.c | 8 |
2 files changed, 9 insertions, 8 deletions
diff --git a/apps/keymaps/keymap-zenxfi3.c b/apps/keymaps/keymap-zenxfi3.c index bdd8b2dae4..191b36a1ca 100644 --- a/apps/keymaps/keymap-zenxfi3.c +++ b/apps/keymaps/keymap-zenxfi3.c | |||
@@ -138,10 +138,11 @@ static const struct button_mapping button_context_radio[] = { | |||
138 | #ifdef HAVE_RECORDING | 138 | #ifdef HAVE_RECORDING |
139 | static const struct button_mapping button_context_recscreen[] = { | 139 | static const struct button_mapping button_context_recscreen[] = { |
140 | { ACTION_REC_PAUSE, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, | 140 | { ACTION_REC_PAUSE, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, |
141 | { ACTION_SETTINGS_INC, BUTTON_UP, BUTTON_NONE }, | 141 | /* we need up/down to switch between settings, so use volume up/down to adjust */ |
142 | { ACTION_SETTINGS_INCREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | 142 | { ACTION_SETTINGS_INC, BUTTON_VOL_UP, BUTTON_NONE }, |
143 | { ACTION_SETTINGS_DEC, BUTTON_DOWN, BUTTON_NONE }, | 143 | { ACTION_SETTINGS_INCREPEAT, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, |
144 | { ACTION_SETTINGS_DECREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 144 | { ACTION_SETTINGS_DEC, BUTTON_VOL_DOWN, BUTTON_NONE }, |
145 | { ACTION_SETTINGS_DECREPEAT, BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | ||
145 | 146 | ||
146 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | 147 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
147 | }; /* button_context_recscreen */ | 148 | }; /* button_context_recscreen */ |
diff --git a/uisimulator/buttonmap/creative-zenxfi3.c b/uisimulator/buttonmap/creative-zenxfi3.c index fcf78a3e90..fd17d18dd3 100644 --- a/uisimulator/buttonmap/creative-zenxfi3.c +++ b/uisimulator/buttonmap/creative-zenxfi3.c | |||
@@ -34,8 +34,8 @@ int key_to_button(int keyboard_button) | |||
34 | new_btn = BUTTON_LEFT; | 34 | new_btn = BUTTON_LEFT; |
35 | break; | 35 | break; |
36 | case SDLK_KP6: | 36 | case SDLK_KP6: |
37 | case SDLK_RIGHT: | 37 | case SDLK_RETURN: |
38 | new_btn = BUTTON_RIGHT; | 38 | new_btn = BUTTON_PLAY; |
39 | break; | 39 | break; |
40 | case SDLK_KP8: | 40 | case SDLK_KP8: |
41 | case SDLK_UP: | 41 | case SDLK_UP: |
@@ -45,8 +45,8 @@ int key_to_button(int keyboard_button) | |||
45 | case SDLK_DOWN: | 45 | case SDLK_DOWN: |
46 | new_btn = BUTTON_DOWN; | 46 | new_btn = BUTTON_DOWN; |
47 | break; | 47 | break; |
48 | case SDLK_PAGEDOWN: | ||
49 | case SDLK_KP3: | 48 | case SDLK_KP3: |
49 | case SDLK_RIGHT: | ||
50 | new_btn = BUTTON_MENU; | 50 | new_btn = BUTTON_MENU; |
51 | break; | 51 | break; |
52 | case SDLK_KP_PLUS: | 52 | case SDLK_KP_PLUS: |
@@ -64,7 +64,7 @@ int key_to_button(int keyboard_button) | |||
64 | 64 | ||
65 | struct button_map bm[] = { | 65 | struct button_map bm[] = { |
66 | { SDLK_LEFT, 69, 303, 10, "Left" }, | 66 | { SDLK_LEFT, 69, 303, 10, "Left" }, |
67 | { SDLK_RIGHT, 241, 172, 10, "Right" }, | 67 | { SDLK_RETURN, 241, 172, 10, "Play/Pause" }, |
68 | { SDLK_UP, 240, 87, 10, "Up" }, | 68 | { SDLK_UP, 240, 87, 10, "Up" }, |
69 | { SDLK_DOWN, 239, 264, 10, "Down" }, | 69 | { SDLK_DOWN, 239, 264, 10, "Down" }, |
70 | { SDLK_PAGEDOWN, 191, 303, 10, "Menu" }, | 70 | { SDLK_PAGEDOWN, 191, 303, 10, "Menu" }, |