diff options
author | Szymon Dziok <b0hoon@o2.pl> | 2014-10-08 10:36:35 +0200 |
---|---|---|
committer | Szymon Dziok <b0hoon@o2.pl> | 2014-10-08 16:31:39 +0200 |
commit | 91bd7f1ebadf532853d587534c873b2b402bbc88 (patch) | |
tree | b096979c7c6a07bb329d0adb9371e7c6b8136924 /apps | |
parent | 40a2ac4b5f93a08777387cfa71a5f19cd9826553 (diff) | |
download | rockbox-91bd7f1ebadf532853d587534c873b2b402bbc88.tar.gz rockbox-91bd7f1ebadf532853d587534c873b2b402bbc88.zip |
YH820/YH92X: Fix keymap for custom settings.
Change-Id: I8e31b416d2e45d024c304e11318f1de8220c30b2
Diffstat (limited to 'apps')
-rw-r--r-- | apps/keymaps/keymap-yh8xx_yh9xx.c | 106 |
1 files changed, 33 insertions, 73 deletions
diff --git a/apps/keymaps/keymap-yh8xx_yh9xx.c b/apps/keymaps/keymap-yh8xx_yh9xx.c index c2616c08c3..32a81fad22 100644 --- a/apps/keymaps/keymap-yh8xx_yh9xx.c +++ b/apps/keymaps/keymap-yh8xx_yh9xx.c | |||
@@ -47,21 +47,18 @@ CONTEXT_CUSTOM|CONTEXT_SETTINGS = the direction keys for the eq/col picker scree | |||
47 | 47 | ||
48 | 48 | ||
49 | static const struct button_mapping button_context_standard[] = { | 49 | static const struct button_mapping button_context_standard[] = { |
50 | { ACTION_STD_OK, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, | 50 | { ACTION_STD_OK, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, |
51 | { ACTION_STD_CANCEL, BUTTON_LEFT, BUTTON_NONE }, | 51 | { ACTION_STD_CANCEL, BUTTON_LEFT, BUTTON_NONE }, |
52 | { ACTION_STD_CANCEL, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | 52 | { ACTION_STD_CANCEL, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, |
53 | |||
54 | { ACTION_STD_PREV, BUTTON_UP, BUTTON_NONE }, | 53 | { ACTION_STD_PREV, BUTTON_UP, BUTTON_NONE }, |
55 | { ACTION_STD_PREVREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | 54 | { ACTION_STD_PREVREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, |
56 | { ACTION_STD_NEXT, BUTTON_DOWN, BUTTON_NONE }, | 55 | { ACTION_STD_NEXT, BUTTON_DOWN, BUTTON_NONE }, |
57 | { ACTION_STD_NEXTREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 56 | { ACTION_STD_NEXTREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
58 | 57 | { ACTION_STD_CONTEXT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_RIGHT }, | |
59 | { ACTION_STD_CONTEXT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_RIGHT }, | ||
60 | /* kludge: pressing 2 directional buttons is easy on this target */ | 58 | /* kludge: pressing 2 directional buttons is easy on this target */ |
61 | { ACTION_STD_QUICKSCREEN, BUTTON_LEFT|BUTTON_DOWN|BUTTON_REPEAT, | 59 | { ACTION_STD_QUICKSCREEN, BUTTON_LEFT|BUTTON_DOWN|BUTTON_REPEAT, |
62 | BUTTON_LEFT|BUTTON_DOWN|BUTTON_REPEAT }, | 60 | BUTTON_LEFT|BUTTON_DOWN|BUTTON_REPEAT }, |
63 | 61 | { ACTION_STD_REC, BUTTON_REC|BUTTON_REPEAT, BUTTON_REC }, | |
64 | { ACTION_STD_REC, BUTTON_REC|BUTTON_REPEAT, BUTTON_REC }, | ||
65 | 62 | ||
66 | LAST_ITEM_IN_LIST | 63 | LAST_ITEM_IN_LIST |
67 | }; /* button_context_standard */ | 64 | }; /* button_context_standard */ |
@@ -69,34 +66,27 @@ static const struct button_mapping button_context_standard[] = { | |||
69 | static const struct button_mapping button_context_wps[] = { | 66 | static const struct button_mapping button_context_wps[] = { |
70 | { ACTION_WPS_PLAY, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, | 67 | { ACTION_WPS_PLAY, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, |
71 | { ACTION_WPS_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, | 68 | { ACTION_WPS_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, |
72 | |||
73 | { ACTION_WPS_SKIPNEXT, BUTTON_FFWD|BUTTON_REL, BUTTON_FFWD }, | 69 | { ACTION_WPS_SKIPNEXT, BUTTON_FFWD|BUTTON_REL, BUTTON_FFWD }, |
74 | { ACTION_WPS_SEEKFWD, BUTTON_FFWD|BUTTON_REPEAT, BUTTON_NONE }, | 70 | { ACTION_WPS_SEEKFWD, BUTTON_FFWD|BUTTON_REPEAT, BUTTON_NONE }, |
75 | { ACTION_WPS_STOPSEEK, BUTTON_FFWD|BUTTON_REL, BUTTON_FFWD|BUTTON_REPEAT }, | 71 | { ACTION_WPS_STOPSEEK, BUTTON_FFWD|BUTTON_REL, BUTTON_FFWD|BUTTON_REPEAT }, |
76 | 72 | { ACTION_WPS_SKIPPREV, BUTTON_REW|BUTTON_REL, BUTTON_REW }, | |
77 | { ACTION_WPS_SKIPPREV, BUTTON_REW|BUTTON_REL, BUTTON_REW }, | ||
78 | { ACTION_WPS_SEEKBACK, BUTTON_REW|BUTTON_REPEAT, BUTTON_NONE }, | 73 | { ACTION_WPS_SEEKBACK, BUTTON_REW|BUTTON_REPEAT, BUTTON_NONE }, |
79 | { ACTION_WPS_STOPSEEK, BUTTON_REW|BUTTON_REL, BUTTON_REW|BUTTON_REPEAT }, | 74 | { ACTION_WPS_STOPSEEK, BUTTON_REW|BUTTON_REL, BUTTON_REW|BUTTON_REPEAT }, |
80 | |||
81 | { ACTION_WPS_ABSETB_NEXTDIR,BUTTON_PLAY|BUTTON_RIGHT, BUTTON_PLAY }, | 75 | { ACTION_WPS_ABSETB_NEXTDIR,BUTTON_PLAY|BUTTON_RIGHT, BUTTON_PLAY }, |
82 | { ACTION_WPS_ABSETA_PREVDIR,BUTTON_PLAY|BUTTON_LEFT, BUTTON_PLAY }, | 76 | { ACTION_WPS_ABSETA_PREVDIR,BUTTON_PLAY|BUTTON_LEFT, BUTTON_PLAY }, |
83 | { ACTION_WPS_ABRESET, BUTTON_PLAY|BUTTON_UP, BUTTON_PLAY }, | 77 | { ACTION_WPS_ABRESET, BUTTON_PLAY|BUTTON_UP, BUTTON_PLAY }, |
84 | |||
85 | { ACTION_WPS_VOLDOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 78 | { ACTION_WPS_VOLDOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
86 | { ACTION_WPS_VOLDOWN, BUTTON_DOWN, BUTTON_NONE }, | 79 | { ACTION_WPS_VOLDOWN, BUTTON_DOWN, BUTTON_NONE }, |
87 | { ACTION_WPS_VOLUP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | 80 | { ACTION_WPS_VOLUP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, |
88 | { ACTION_WPS_VOLUP, BUTTON_UP, BUTTON_NONE }, | 81 | { ACTION_WPS_VOLUP, BUTTON_UP, BUTTON_NONE }, |
89 | |||
90 | { ACTION_WPS_BROWSE, BUTTON_RIGHT|BUTTON_REL, BUTTON_NONE }, | 82 | { ACTION_WPS_BROWSE, BUTTON_RIGHT|BUTTON_REL, BUTTON_NONE }, |
91 | |||
92 | /* these match context_standard */ | 83 | /* these match context_standard */ |
93 | { ACTION_WPS_MENU, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, | 84 | { ACTION_WPS_MENU, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, |
94 | { ACTION_WPS_CONTEXT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_RIGHT }, | 85 | { ACTION_WPS_CONTEXT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_RIGHT }, |
95 | /* kludge: pressing 2 directional buttons is easy on this target */ | 86 | /* kludge: pressing 2 directional buttons is easy on this target */ |
96 | { ACTION_WPS_QUICKSCREEN, BUTTON_LEFT|BUTTON_DOWN|BUTTON_REPEAT, | 87 | { ACTION_WPS_QUICKSCREEN, BUTTON_LEFT|BUTTON_DOWN|BUTTON_REPEAT, |
97 | BUTTON_LEFT|BUTTON_DOWN|BUTTON_REPEAT }, | 88 | BUTTON_LEFT|BUTTON_DOWN|BUTTON_REPEAT }, |
98 | 89 | { ACTION_WPS_HOTKEY, BUTTON_REC|BUTTON_REL, BUTTON_REC }, | |
99 | { ACTION_WPS_HOTKEY, BUTTON_REC|BUTTON_REL, BUTTON_REC }, | ||
100 | { ACTION_WPS_VIEW_PLAYLIST, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT }, | 90 | { ACTION_WPS_VIEW_PLAYLIST, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT }, |
101 | { ACTION_WPS_REC, BUTTON_REC|BUTTON_REPEAT, BUTTON_NONE }, | 91 | { ACTION_WPS_REC, BUTTON_REC|BUTTON_REPEAT, BUTTON_NONE }, |
102 | 92 | ||
@@ -118,7 +108,7 @@ static const struct button_mapping button_context_list[] = { | |||
118 | static const struct button_mapping button_context_tree[] = { | 108 | static const struct button_mapping button_context_tree[] = { |
119 | { ACTION_TREE_WPS, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, | 109 | { ACTION_TREE_WPS, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, |
120 | { ACTION_TREE_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, | 110 | { ACTION_TREE_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, |
121 | { ACTION_TREE_HOTKEY, BUTTON_REC|BUTTON_REL, BUTTON_REC }, | 111 | { ACTION_TREE_HOTKEY, BUTTON_REC|BUTTON_REL, BUTTON_REC }, |
122 | 112 | ||
123 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST) | 113 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST) |
124 | }; /* button_context_tree */ | 114 | }; /* button_context_tree */ |
@@ -134,9 +124,9 @@ static const struct button_mapping button_context_listtree_scroll_with_combo[] | |||
134 | }; | 124 | }; |
135 | 125 | ||
136 | static const struct button_mapping button_context_listtree_scroll_without_combo[] = { | 126 | static const struct button_mapping button_context_listtree_scroll_without_combo[] = { |
137 | { ACTION_TREE_ROOT_INIT, BUTTON_REW|BUTTON_REPEAT, BUTTON_REW }, | 127 | { ACTION_TREE_ROOT_INIT, BUTTON_REW|BUTTON_REPEAT, BUTTON_REW }, |
138 | { ACTION_TREE_PGLEFT, BUTTON_REW|BUTTON_REPEAT, BUTTON_NONE }, | 128 | { ACTION_TREE_PGLEFT, BUTTON_REW|BUTTON_REPEAT, BUTTON_NONE }, |
139 | { ACTION_TREE_PGRIGHT, BUTTON_FFWD|BUTTON_REPEAT, BUTTON_NONE }, | 129 | { ACTION_TREE_PGRIGHT, BUTTON_FFWD|BUTTON_REPEAT, BUTTON_NONE }, |
140 | 130 | ||
141 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE) | 131 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE) |
142 | }; | 132 | }; |
@@ -144,37 +134,30 @@ static const struct button_mapping button_context_listtree_scroll_without_combo[ | |||
144 | static const struct button_mapping button_context_settings[] = { | 134 | static const struct button_mapping button_context_settings[] = { |
145 | { ACTION_SETTINGS_INC, BUTTON_UP, BUTTON_NONE }, | 135 | { ACTION_SETTINGS_INC, BUTTON_UP, BUTTON_NONE }, |
146 | { ACTION_SETTINGS_INCREPEAT,BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | 136 | { ACTION_SETTINGS_INCREPEAT,BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, |
147 | |||
148 | { ACTION_SETTINGS_DEC, BUTTON_DOWN, BUTTON_NONE }, | 137 | { ACTION_SETTINGS_DEC, BUTTON_DOWN, BUTTON_NONE }, |
149 | { ACTION_SETTINGS_DECREPEAT,BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 138 | { ACTION_SETTINGS_DECREPEAT,BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
150 | 139 | { ACTION_NONE, BUTTON_LEFT, BUTTON_NONE }, | |
151 | { ACTION_NONE, BUTTON_LEFT, BUTTON_NONE }, | ||
152 | { ACTION_STD_PREV, BUTTON_LEFT|BUTTON_REL, BUTTON_NONE }, | 140 | { ACTION_STD_PREV, BUTTON_LEFT|BUTTON_REL, BUTTON_NONE }, |
153 | { ACTION_STD_PREVREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | 141 | { ACTION_STD_PREVREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, |
154 | |||
155 | { ACTION_STD_NEXT, BUTTON_RIGHT|BUTTON_REL, BUTTON_NONE }, | 142 | { ACTION_STD_NEXT, BUTTON_RIGHT|BUTTON_REL, BUTTON_NONE }, |
156 | { ACTION_STD_NEXTREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | 143 | { ACTION_STD_NEXTREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, |
157 | |||
158 | { ACTION_SETTINGS_RESET, BUTTON_PLAY, BUTTON_NONE }, | 144 | { ACTION_SETTINGS_RESET, BUTTON_PLAY, BUTTON_NONE }, |
159 | 145 | ||
160 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | 146 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
161 | }; /* button_context_settings */ | 147 | }; /* button_context_settings */ |
162 | 148 | ||
163 | static const struct button_mapping button_context_settings_right_is_inc[] = { | 149 | static const struct button_mapping button_context_settings_right_is_inc[] = { |
150 | { ACTION_NONE, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, | ||
164 | { ACTION_SETTINGS_INC, BUTTON_RIGHT, BUTTON_NONE }, | 151 | { ACTION_SETTINGS_INC, BUTTON_RIGHT, BUTTON_NONE }, |
165 | { ACTION_SETTINGS_INCREPEAT,BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | 152 | { ACTION_SETTINGS_INCREPEAT,BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, |
166 | |||
167 | { ACTION_SETTINGS_DEC, BUTTON_LEFT, BUTTON_NONE }, | 153 | { ACTION_SETTINGS_DEC, BUTTON_LEFT, BUTTON_NONE }, |
168 | { ACTION_SETTINGS_DECREPEAT,BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | 154 | { ACTION_SETTINGS_DECREPEAT,BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, |
169 | 155 | { ACTION_SETTINGS_RESET, BUTTON_PLAY, BUTTON_NONE }, | |
170 | { ACTION_STD_PREV, BUTTON_UP, BUTTON_NONE }, | 156 | { ACTION_STD_PREV, BUTTON_UP, BUTTON_NONE }, |
171 | { ACTION_STD_PREVREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | 157 | { ACTION_STD_PREVREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, |
172 | |||
173 | { ACTION_STD_NEXT, BUTTON_DOWN, BUTTON_NONE }, | 158 | { ACTION_STD_NEXT, BUTTON_DOWN, BUTTON_NONE }, |
174 | { ACTION_STD_NEXTREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 159 | { ACTION_STD_NEXTREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
175 | 160 | ||
176 | { ACTION_SETTINGS_RESET, BUTTON_PLAY, BUTTON_NONE }, | ||
177 | |||
178 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | 161 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
179 | }; /* button_context_settingsgraphical */ | 162 | }; /* button_context_settingsgraphical */ |
180 | 163 | ||
@@ -191,7 +174,8 @@ static const struct button_mapping button_context_colorchooser[] = { | |||
191 | }; /* button_context_settings_colorchooser */ | 174 | }; /* button_context_settings_colorchooser */ |
192 | 175 | ||
193 | static const struct button_mapping button_context_eq[] = { | 176 | static const struct button_mapping button_context_eq[] = { |
194 | { ACTION_STD_OK, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, | 177 | { ACTION_STD_OK, BUTTON_FFWD|BUTTON_REL, BUTTON_FFWD }, |
178 | { ACTION_STD_CANCEL, BUTTON_REW|BUTTON_REL, BUTTON_REW }, | ||
195 | 179 | ||
196 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS) | 180 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS) |
197 | }; /* button_context_settings_context_eq */ | 181 | }; /* button_context_settings_context_eq */ |
@@ -210,23 +194,18 @@ static const struct button_mapping button_context_time[] = { | |||
210 | }; /* button_context_settings_bmark */ | 194 | }; /* button_context_settings_bmark */ |
211 | 195 | ||
212 | static const struct button_mapping button_context_quickscreen[] = { | 196 | static const struct button_mapping button_context_quickscreen[] = { |
213 | { ACTION_NONE, BUTTON_LEFT, BUTTON_NONE }, | 197 | { ACTION_NONE, BUTTON_LEFT, BUTTON_NONE }, |
214 | { ACTION_NONE, BUTTON_LEFT|BUTTON_DOWN|BUTTON_REL,BUTTON_NONE }, | 198 | { ACTION_NONE, BUTTON_LEFT|BUTTON_DOWN|BUTTON_REL,BUTTON_NONE }, |
215 | 199 | { ACTION_QS_TOP, BUTTON_UP|BUTTON_REL, BUTTON_UP }, | |
216 | { ACTION_QS_TOP, BUTTON_UP|BUTTON_REL, BUTTON_UP }, | 200 | { ACTION_QS_TOP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, |
217 | { ACTION_QS_TOP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | 201 | { ACTION_QS_DOWN, BUTTON_DOWN|BUTTON_REL, BUTTON_DOWN }, |
218 | 202 | { ACTION_QS_DOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | |
219 | { ACTION_QS_DOWN, BUTTON_DOWN|BUTTON_REL, BUTTON_DOWN }, | 203 | { ACTION_QS_LEFT, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, |
220 | { ACTION_QS_DOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 204 | { ACTION_QS_LEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, |
221 | 205 | { ACTION_QS_RIGHT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, | |
222 | { ACTION_QS_LEFT, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, | 206 | { ACTION_QS_RIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, |
223 | { ACTION_QS_LEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | 207 | { ACTION_STD_CANCEL, BUTTON_PLAY, BUTTON_NONE }, |
224 | 208 | { ACTION_STD_CANCEL, BUTTON_FFWD, BUTTON_NONE }, | |
225 | { ACTION_QS_RIGHT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, | ||
226 | { ACTION_QS_RIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | ||
227 | |||
228 | { ACTION_STD_CANCEL, BUTTON_PLAY, BUTTON_NONE }, | ||
229 | { ACTION_STD_CANCEL, BUTTON_FFWD, BUTTON_NONE }, | ||
230 | 209 | ||
231 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | 210 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
232 | }; /* button_context_quickscreen */ | 211 | }; /* button_context_quickscreen */ |
@@ -234,19 +213,14 @@ static const struct button_mapping button_context_quickscreen[] = { | |||
234 | static const struct button_mapping button_context_pitchscreen[] = { | 213 | static const struct button_mapping button_context_pitchscreen[] = { |
235 | { ACTION_PS_INC_SMALL, BUTTON_UP, BUTTON_NONE }, | 214 | { ACTION_PS_INC_SMALL, BUTTON_UP, BUTTON_NONE }, |
236 | { ACTION_PS_INC_BIG, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | 215 | { ACTION_PS_INC_BIG, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, |
237 | |||
238 | { ACTION_PS_DEC_SMALL, BUTTON_DOWN, BUTTON_NONE }, | 216 | { ACTION_PS_DEC_SMALL, BUTTON_DOWN, BUTTON_NONE }, |
239 | { ACTION_PS_DEC_BIG, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 217 | { ACTION_PS_DEC_BIG, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
240 | |||
241 | { ACTION_PS_NUDGE_LEFT, BUTTON_LEFT, BUTTON_NONE }, | 218 | { ACTION_PS_NUDGE_LEFT, BUTTON_LEFT, BUTTON_NONE }, |
242 | { ACTION_PS_NUDGE_LEFTOFF, BUTTON_LEFT|BUTTON_REL, BUTTON_NONE }, | 219 | { ACTION_PS_NUDGE_LEFTOFF, BUTTON_LEFT|BUTTON_REL, BUTTON_NONE }, |
243 | |||
244 | { ACTION_PS_NUDGE_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, | 220 | { ACTION_PS_NUDGE_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, |
245 | { ACTION_PS_NUDGE_RIGHTOFF, BUTTON_RIGHT|BUTTON_REL, BUTTON_NONE }, | 221 | { ACTION_PS_NUDGE_RIGHTOFF, BUTTON_RIGHT|BUTTON_REL, BUTTON_NONE }, |
246 | |||
247 | { ACTION_PS_SLOWER, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | 222 | { ACTION_PS_SLOWER, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, |
248 | { ACTION_PS_FASTER, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | 223 | { ACTION_PS_FASTER, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, |
249 | |||
250 | { ACTION_PS_TOGGLE_MODE, BUTTON_FFWD, BUTTON_NONE }, | 224 | { ACTION_PS_TOGGLE_MODE, BUTTON_FFWD, BUTTON_NONE }, |
251 | { ACTION_PS_RESET, BUTTON_REW, BUTTON_NONE }, | 225 | { ACTION_PS_RESET, BUTTON_REW, BUTTON_NONE }, |
252 | { ACTION_PS_EXIT, BUTTON_PLAY, BUTTON_NONE }, | 226 | { ACTION_PS_EXIT, BUTTON_PLAY, BUTTON_NONE }, |
@@ -257,11 +231,9 @@ static const struct button_mapping button_context_pitchscreen[] = { | |||
257 | static const struct button_mapping button_context_recscreen[] = { | 231 | static const struct button_mapping button_context_recscreen[] = { |
258 | { ACTION_REC_PAUSE, BUTTON_PLAY|BUTTON_REL, BUTTON_NONE }, | 232 | { ACTION_REC_PAUSE, BUTTON_PLAY|BUTTON_REL, BUTTON_NONE }, |
259 | { ACTION_REC_NEWFILE, BUTTON_FFWD|BUTTON_REL, BUTTON_NONE }, | 233 | { ACTION_REC_NEWFILE, BUTTON_FFWD|BUTTON_REL, BUTTON_NONE }, |
260 | |||
261 | { ACTION_STD_MENU, BUTTON_REW|BUTTON_REL, BUTTON_NONE }, | 234 | { ACTION_STD_MENU, BUTTON_REW|BUTTON_REL, BUTTON_NONE }, |
262 | { ACTION_STD_CANCEL, BUTTON_REW|BUTTON_REPEAT, BUTTON_REW }, | 235 | { ACTION_STD_CANCEL, BUTTON_REW|BUTTON_REPEAT, BUTTON_REW }, |
263 | { ACTION_STD_CANCEL, BUTTON_REC, BUTTON_NONE }, | 236 | { ACTION_STD_CANCEL, BUTTON_REC, BUTTON_NONE }, |
264 | |||
265 | { ACTION_SETTINGS_INC, BUTTON_RIGHT, BUTTON_NONE }, | 237 | { ACTION_SETTINGS_INC, BUTTON_RIGHT, BUTTON_NONE }, |
266 | { ACTION_SETTINGS_INCREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | 238 | { ACTION_SETTINGS_INCREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, |
267 | { ACTION_SETTINGS_DEC, BUTTON_LEFT, BUTTON_NONE }, | 239 | { ACTION_SETTINGS_DEC, BUTTON_LEFT, BUTTON_NONE }, |
@@ -273,33 +245,24 @@ static const struct button_mapping button_context_recscreen[] = { | |||
273 | static const struct button_mapping button_context_keyboard[] = { | 245 | static const struct button_mapping button_context_keyboard[] = { |
274 | { ACTION_KBD_UP, BUTTON_UP, BUTTON_NONE }, | 246 | { ACTION_KBD_UP, BUTTON_UP, BUTTON_NONE }, |
275 | { ACTION_KBD_UP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | 247 | { ACTION_KBD_UP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, |
276 | |||
277 | { ACTION_KBD_DOWN, BUTTON_DOWN, BUTTON_NONE }, | 248 | { ACTION_KBD_DOWN, BUTTON_DOWN, BUTTON_NONE }, |
278 | { ACTION_KBD_DOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 249 | { ACTION_KBD_DOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
279 | |||
280 | { ACTION_KBD_LEFT, BUTTON_LEFT, BUTTON_NONE }, | 250 | { ACTION_KBD_LEFT, BUTTON_LEFT, BUTTON_NONE }, |
281 | { ACTION_KBD_LEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | 251 | { ACTION_KBD_LEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, |
282 | |||
283 | { ACTION_KBD_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, | 252 | { ACTION_KBD_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, |
284 | { ACTION_KBD_RIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | 253 | { ACTION_KBD_RIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, |
285 | |||
286 | { ACTION_KBD_CURSOR_LEFT, BUTTON_FFWD|BUTTON_LEFT, BUTTON_NONE }, | 254 | { ACTION_KBD_CURSOR_LEFT, BUTTON_FFWD|BUTTON_LEFT, BUTTON_NONE }, |
287 | { ACTION_KBD_CURSOR_LEFT, BUTTON_FFWD|BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | 255 | { ACTION_KBD_CURSOR_LEFT, BUTTON_FFWD|BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, |
288 | { ACTION_KBD_CURSOR_RIGHT, BUTTON_FFWD|BUTTON_RIGHT, BUTTON_NONE }, | 256 | { ACTION_KBD_CURSOR_RIGHT, BUTTON_FFWD|BUTTON_RIGHT, BUTTON_NONE }, |
289 | { ACTION_KBD_CURSOR_RIGHT, BUTTON_FFWD|BUTTON_RIGHT|BUTTON_REPEAT,BUTTON_NONE }, | 257 | { ACTION_KBD_CURSOR_RIGHT, BUTTON_FFWD|BUTTON_RIGHT|BUTTON_REPEAT,BUTTON_NONE }, |
290 | |||
291 | { ACTION_KBD_SELECT, BUTTON_PLAY|BUTTON_REL, BUTTON_NONE }, | 258 | { ACTION_KBD_SELECT, BUTTON_PLAY|BUTTON_REL, BUTTON_NONE }, |
292 | { ACTION_KBD_PAGE_FLIP, BUTTON_FFWD|BUTTON_REL, BUTTON_FFWD }, | 259 | { ACTION_KBD_PAGE_FLIP, BUTTON_FFWD|BUTTON_REL, BUTTON_FFWD }, |
293 | |||
294 | { ACTION_KBD_DONE, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE }, | 260 | { ACTION_KBD_DONE, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE }, |
295 | { ACTION_KBD_DONE, BUTTON_FFWD|BUTTON_PLAY, BUTTON_NONE }, | 261 | { ACTION_KBD_DONE, BUTTON_FFWD|BUTTON_PLAY, BUTTON_NONE }, |
296 | |||
297 | { ACTION_KBD_ABORT, BUTTON_FFWD|BUTTON_REW, BUTTON_NONE }, | 262 | { ACTION_KBD_ABORT, BUTTON_FFWD|BUTTON_REW, BUTTON_NONE }, |
298 | { ACTION_KBD_ABORT, BUTTON_REC, BUTTON_NONE }, | 263 | { ACTION_KBD_ABORT, BUTTON_REC, BUTTON_NONE }, |
299 | 264 | { ACTION_KBD_BACKSPACE, BUTTON_REW|BUTTON_REL, BUTTON_REW }, | |
300 | { ACTION_KBD_BACKSPACE, BUTTON_REW|BUTTON_REL, BUTTON_REW }, | ||
301 | { ACTION_KBD_BACKSPACE, BUTTON_REW|BUTTON_REPEAT, BUTTON_NONE }, | 265 | { ACTION_KBD_BACKSPACE, BUTTON_REW|BUTTON_REPEAT, BUTTON_NONE }, |
302 | |||
303 | { ACTION_KBD_MORSE_INPUT, BUTTON_FFWD|BUTTON_REL, BUTTON_FFWD|BUTTON_REPEAT }, | 266 | { ACTION_KBD_MORSE_INPUT, BUTTON_FFWD|BUTTON_REL, BUTTON_FFWD|BUTTON_REPEAT }, |
304 | { ACTION_KBD_MORSE_SELECT, BUTTON_PLAY|BUTTON_REL, BUTTON_NONE }, | 267 | { ACTION_KBD_MORSE_SELECT, BUTTON_PLAY|BUTTON_REL, BUTTON_NONE }, |
305 | 268 | ||
@@ -312,7 +275,7 @@ static const struct button_mapping button_context_radio[] = { | |||
312 | { ACTION_FM_EXIT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | 275 | { ACTION_FM_EXIT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, |
313 | { ACTION_FM_PLAY, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, | 276 | { ACTION_FM_PLAY, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, |
314 | { ACTION_FM_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE }, | 277 | { ACTION_FM_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE }, |
315 | { ACTION_FM_PRESET, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT}, | 278 | { ACTION_FM_PRESET, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, |
316 | { ACTION_FM_MODE, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | 279 | { ACTION_FM_MODE, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, |
317 | { ACTION_SETTINGS_INC, BUTTON_UP, BUTTON_NONE }, | 280 | { ACTION_SETTINGS_INC, BUTTON_UP, BUTTON_NONE }, |
318 | { ACTION_SETTINGS_INCREPEAT,BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | 281 | { ACTION_SETTINGS_INCREPEAT,BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, |
@@ -331,8 +294,8 @@ static const struct button_mapping button_context_radio[] = { | |||
331 | static const struct button_mapping button_context_usb_hid[] = { | 294 | static const struct button_mapping button_context_usb_hid[] = { |
332 | { ACTION_USB_HID_MODE_SWITCH_NEXT, BUTTON_REC|BUTTON_FFWD|BUTTON_REL, BUTTON_REC|BUTTON_FFWD }, | 295 | { ACTION_USB_HID_MODE_SWITCH_NEXT, BUTTON_REC|BUTTON_FFWD|BUTTON_REL, BUTTON_REC|BUTTON_FFWD }, |
333 | { ACTION_USB_HID_MODE_SWITCH_NEXT, BUTTON_REC|BUTTON_FFWD|BUTTON_REPEAT,BUTTON_REC|BUTTON_FFWD }, | 296 | { ACTION_USB_HID_MODE_SWITCH_NEXT, BUTTON_REC|BUTTON_FFWD|BUTTON_REPEAT,BUTTON_REC|BUTTON_FFWD }, |
334 | { ACTION_USB_HID_MODE_SWITCH_PREV, BUTTON_REC|BUTTON_REW|BUTTON_REL, BUTTON_REC|BUTTON_REW }, | 297 | { ACTION_USB_HID_MODE_SWITCH_PREV, BUTTON_REC|BUTTON_REW|BUTTON_REL, BUTTON_REC|BUTTON_REW }, |
335 | { ACTION_USB_HID_MODE_SWITCH_PREV, BUTTON_REC|BUTTON_REW|BUTTON_REPEAT, BUTTON_REC|BUTTON_REW }, | 298 | { ACTION_USB_HID_MODE_SWITCH_PREV, BUTTON_REC|BUTTON_REW|BUTTON_REPEAT, BUTTON_REC|BUTTON_REW }, |
336 | 299 | ||
337 | LAST_ITEM_IN_LIST | 300 | LAST_ITEM_IN_LIST |
338 | }; /* button_context_usb_hid */ | 301 | }; /* button_context_usb_hid */ |
@@ -375,14 +338,11 @@ static const struct button_mapping button_context_usb_hid_mode_browser[] = { | |||
375 | { ACTION_USB_HID_BROWSER_SCROLL_UP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | 338 | { ACTION_USB_HID_BROWSER_SCROLL_UP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, |
376 | { ACTION_USB_HID_BROWSER_SCROLL_DOWN, BUTTON_DOWN, BUTTON_NONE }, | 339 | { ACTION_USB_HID_BROWSER_SCROLL_DOWN, BUTTON_DOWN, BUTTON_NONE }, |
377 | { ACTION_USB_HID_BROWSER_SCROLL_DOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 340 | { ACTION_USB_HID_BROWSER_SCROLL_DOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
378 | |||
379 | { ACTION_USB_HID_BROWSER_SCROLL_PAGE_UP, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, | 341 | { ACTION_USB_HID_BROWSER_SCROLL_PAGE_UP, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, |
380 | { ACTION_USB_HID_BROWSER_SCROLL_PAGE_DOWN, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, | 342 | { ACTION_USB_HID_BROWSER_SCROLL_PAGE_DOWN, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, |
381 | |||
382 | { ACTION_USB_HID_BROWSER_ZOOM_IN, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_RIGHT }, | 343 | { ACTION_USB_HID_BROWSER_ZOOM_IN, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_RIGHT }, |
383 | { ACTION_USB_HID_BROWSER_ZOOM_OUT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT }, | 344 | { ACTION_USB_HID_BROWSER_ZOOM_OUT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT }, |
384 | { ACTION_USB_HID_BROWSER_ZOOM_RESET, BUTTON_LEFT|BUTTON_DOWN|BUTTON_REPEAT, BUTTON_LEFT|BUTTON_DOWN }, | 345 | { ACTION_USB_HID_BROWSER_ZOOM_RESET, BUTTON_LEFT|BUTTON_DOWN|BUTTON_REPEAT, BUTTON_LEFT|BUTTON_DOWN }, |
385 | |||
386 | { ACTION_USB_HID_BROWSER_TAB_PREV, BUTTON_REW|BUTTON_REL, BUTTON_REW }, | 346 | { ACTION_USB_HID_BROWSER_TAB_PREV, BUTTON_REW|BUTTON_REL, BUTTON_REW }, |
387 | { ACTION_USB_HID_BROWSER_TAB_NEXT, BUTTON_FFWD|BUTTON_REL, BUTTON_FFWD }, | 347 | { ACTION_USB_HID_BROWSER_TAB_NEXT, BUTTON_FFWD|BUTTON_REL, BUTTON_FFWD }, |
388 | { ACTION_USB_HID_BROWSER_TAB_CLOSE, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, | 348 | { ACTION_USB_HID_BROWSER_TAB_CLOSE, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, |