diff options
author | Rani Hod <raenye@gmail.com> | 2006-09-23 02:10:00 +0000 |
---|---|---|
committer | Rani Hod <raenye@gmail.com> | 2006-09-23 02:10:00 +0000 |
commit | cbe4427a0a2cf219a8b6578c662c5135c07d1af1 (patch) | |
tree | d9e62c8fa61385ff43ff58ba1fcd2a598bf9c2cb /apps/keymaps/keymap-x5.c | |
parent | 32e6f114aabc0939a5c5db16a6ad650efcfc7f18 (diff) | |
download | rockbox-cbe4427a0a2cf219a8b6578c662c5135c07d1af1.tar.gz rockbox-cbe4427a0a2cf219a8b6578c662c5135c07d1af1.zip |
some fixes for X5 remote, still needs a major rework.
Now pitch screen and quick screen are usable (and exitable...) as well
as tree/menu navigation. The latter is not consistent yet, though.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11029 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/keymaps/keymap-x5.c')
-rw-r--r-- | apps/keymaps/keymap-x5.c | 177 |
1 files changed, 112 insertions, 65 deletions
diff --git a/apps/keymaps/keymap-x5.c b/apps/keymaps/keymap-x5.c index 1ef7d6a5c9..3bc6c97dee 100644 --- a/apps/keymaps/keymap-x5.c +++ b/apps/keymaps/keymap-x5.c | |||
@@ -51,7 +51,22 @@ const struct button_mapping button_context_standard[] = { | |||
51 | { ACTION_STD_CANCEL, BUTTON_POWER, BUTTON_NONE }, | 51 | { ACTION_STD_CANCEL, BUTTON_POWER, BUTTON_NONE }, |
52 | 52 | ||
53 | LAST_ITEM_IN_LIST | 53 | LAST_ITEM_IN_LIST |
54 | }; | 54 | }; /* button_context_standard */ |
55 | |||
56 | const struct button_mapping remote_button_context_standard[] = { | ||
57 | { ACTION_STD_PREV, BUTTON_RC_REW, BUTTON_NONE }, | ||
58 | { ACTION_STD_PREVREPEAT, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_NONE }, | ||
59 | { ACTION_STD_NEXT, BUTTON_RC_FF, BUTTON_NONE }, | ||
60 | { ACTION_STD_NEXTREPEAT, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_NONE }, | ||
61 | |||
62 | { ACTION_STD_CONTEXT, BUTTON_RC_PLAY|BUTTON_REPEAT, BUTTON_RC_PLAY }, | ||
63 | { ACTION_STD_CANCEL, BUTTON_RC_MODE, BUTTON_NONE }, | ||
64 | { ACTION_STD_OK, BUTTON_RC_PLAY|BUTTON_REL, BUTTON_RC_PLAY }, | ||
65 | { ACTION_STD_MENU, BUTTON_RC_MENU|BUTTON_REL, BUTTON_RC_MENU }, | ||
66 | { ACTION_STD_QUICKSCREEN, BUTTON_RC_MENU|BUTTON_REPEAT, BUTTON_RC_MENU }, | ||
67 | |||
68 | LAST_ITEM_IN_LIST | ||
69 | }; /* remote_button_context_standard */ | ||
55 | 70 | ||
56 | const struct button_mapping button_context_wps[] = { | 71 | const struct button_mapping button_context_wps[] = { |
57 | { ACTION_WPS_PLAY, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, | 72 | { ACTION_WPS_PLAY, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, |
@@ -72,10 +87,32 @@ const struct button_mapping button_context_wps[] = { | |||
72 | { ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, | 87 | { ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, |
73 | { ACTION_WPS_MENU, BUTTON_REC|BUTTON_REL, BUTTON_REC }, | 88 | { ACTION_WPS_MENU, BUTTON_REC|BUTTON_REL, BUTTON_REC }, |
74 | { ACTION_WPS_QUICKSCREEN, BUTTON_REC|BUTTON_REPEAT, BUTTON_REC }, | 89 | { ACTION_WPS_QUICKSCREEN, BUTTON_REC|BUTTON_REPEAT, BUTTON_REC }, |
75 | |||
76 | 90 | ||
77 | LAST_ITEM_IN_LIST | 91 | LAST_ITEM_IN_LIST |
78 | }; | 92 | }; /* button_context_wps */ |
93 | |||
94 | const struct button_mapping remote_button_context_wps[] = { | ||
95 | { ACTION_WPS_PLAY, BUTTON_RC_PLAY|BUTTON_REL, BUTTON_RC_PLAY }, | ||
96 | { ACTION_WPS_STOP, BUTTON_RC_PLAY|BUTTON_REPEAT, BUTTON_RC_PLAY }, | ||
97 | { ACTION_WPS_SKIPPREV, BUTTON_RC_REW|BUTTON_REL, BUTTON_RC_REW }, | ||
98 | { ACTION_WPS_SEEKBACK, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_NONE }, | ||
99 | { ACTION_WPS_STOPSEEK, BUTTON_RC_REW|BUTTON_REL, BUTTON_RC_REW|BUTTON_REPEAT }, | ||
100 | { ACTION_WPS_SKIPNEXT, BUTTON_RC_FF|BUTTON_REL, BUTTON_RC_FF }, | ||
101 | { ACTION_WPS_SEEKFWD, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_NONE }, | ||
102 | { ACTION_WPS_STOPSEEK, BUTTON_RC_FF|BUTTON_REL, BUTTON_RC_FF|BUTTON_REPEAT }, | ||
103 | |||
104 | { ACTION_WPS_VOLDOWN, BUTTON_RC_VOL_DOWN, BUTTON_NONE }, | ||
105 | { ACTION_WPS_VOLDOWN, BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | ||
106 | { ACTION_WPS_VOLUP, BUTTON_RC_VOL_UP, BUTTON_NONE }, | ||
107 | { ACTION_WPS_VOLUP, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, | ||
108 | |||
109 | { ACTION_WPS_BROWSE, BUTTON_RC_MODE|BUTTON_REL, BUTTON_RC_MODE }, | ||
110 | { ACTION_WPS_CONTEXT, BUTTON_RC_MODE|BUTTON_REPEAT, BUTTON_RC_MODE }, | ||
111 | { ACTION_WPS_MENU, BUTTON_RC_MENU|BUTTON_REL, BUTTON_RC_MENU }, | ||
112 | { ACTION_WPS_QUICKSCREEN, BUTTON_RC_MENU|BUTTON_REPEAT, BUTTON_RC_MENU }, | ||
113 | |||
114 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | ||
115 | }; /* remote_button_context_wps */ | ||
79 | 116 | ||
80 | const struct button_mapping button_context_settings[] = { | 117 | const struct button_mapping button_context_settings[] = { |
81 | { ACTION_SETTINGS_INC, BUTTON_UP, BUTTON_NONE }, | 118 | { ACTION_SETTINGS_INC, BUTTON_UP, BUTTON_NONE }, |
@@ -86,18 +123,38 @@ const struct button_mapping button_context_settings[] = { | |||
86 | { ACTION_STD_CANCEL, BUTTON_REC, BUTTON_NONE }, | 123 | { ACTION_STD_CANCEL, BUTTON_REC, BUTTON_NONE }, |
87 | 124 | ||
88 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | 125 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
89 | }; | 126 | }; /* button_context_settings */ |
127 | |||
90 | const struct button_mapping button_context_menu[] = { | 128 | const struct button_mapping button_context_menu[] = { |
91 | { ACTION_NONE, BUTTON_POWER, BUTTON_NONE }, | 129 | { ACTION_NONE, BUTTON_POWER, BUTTON_NONE }, |
130 | |||
131 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | ||
132 | }; /* button_context_menu */ | ||
133 | |||
134 | const struct button_mapping remote_button_context_menu[] = { | ||
135 | { ACTION_STD_CANCEL, BUTTON_RC_VOL_DOWN, BUTTON_NONE }, | ||
136 | { ACTION_STD_OK, BUTTON_RC_VOL_UP, BUTTON_NONE }, | ||
137 | |||
92 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | 138 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
93 | }; | 139 | }; /* remote_button_context_menu */ |
140 | |||
94 | const struct button_mapping button_context_tree[] = { | 141 | const struct button_mapping button_context_tree[] = { |
95 | { ACTION_NONE, BUTTON_PLAY, BUTTON_NONE }, | 142 | { ACTION_NONE, BUTTON_PLAY, BUTTON_NONE }, |
96 | { ACTION_TREE_WPS, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, | 143 | { ACTION_TREE_WPS, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, |
97 | { ACTION_TREE_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, | 144 | { ACTION_TREE_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, |
98 | 145 | ||
99 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | 146 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
100 | }; | 147 | }; /* button_context_tree */ |
148 | |||
149 | const struct button_mapping remote_button_context_tree[] = { | ||
150 | { ACTION_STD_CANCEL, BUTTON_RC_VOL_DOWN, BUTTON_NONE }, | ||
151 | { ACTION_STD_OK, BUTTON_RC_VOL_UP, BUTTON_NONE }, | ||
152 | { ACTION_NONE, BUTTON_RC_MODE, BUTTON_NONE }, | ||
153 | { ACTION_TREE_WPS, BUTTON_RC_MODE|BUTTON_REL, BUTTON_RC_MODE }, | ||
154 | { ACTION_TREE_STOP, BUTTON_RC_PLAY|BUTTON_REPEAT, BUTTON_RC_PLAY }, | ||
155 | |||
156 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | ||
157 | }; /* remote_button_context_tree */ | ||
101 | 158 | ||
102 | const struct button_mapping button_context_tree_scroll_lr[] = { | 159 | const struct button_mapping button_context_tree_scroll_lr[] = { |
103 | { ACTION_NONE, BUTTON_LEFT, BUTTON_NONE }, | 160 | { ACTION_NONE, BUTTON_LEFT, BUTTON_NONE }, |
@@ -109,7 +166,7 @@ const struct button_mapping button_context_tree_scroll_lr[] = { | |||
109 | { ACTION_TREE_PGRIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | 166 | { ACTION_TREE_PGRIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, |
110 | { ACTION_TREE_PGRIGHT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT|BUTTON_REPEAT }, | 167 | { ACTION_TREE_PGRIGHT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT|BUTTON_REPEAT }, |
111 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE), | 168 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE), |
112 | }; | 169 | }; /* button_context_tree_scroll_lr */ |
113 | 170 | ||
114 | const struct button_mapping button_context_yesno[] = { | 171 | const struct button_mapping button_context_yesno[] = { |
115 | { ACTION_YESNO_ACCEPT, BUTTON_SELECT, BUTTON_NONE }, | 172 | { ACTION_YESNO_ACCEPT, BUTTON_SELECT, BUTTON_NONE }, |
@@ -130,6 +187,19 @@ const struct button_mapping button_context_quickscreen[] = { | |||
130 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | 187 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
131 | }; /* button_context_quickscreen */ | 188 | }; /* button_context_quickscreen */ |
132 | 189 | ||
190 | const struct button_mapping remote_button_context_quickscreen[] = { | ||
191 | { ACTION_QS_DOWNINV, BUTTON_RC_VOL_UP, BUTTON_NONE }, | ||
192 | { ACTION_QS_DOWNINV, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, | ||
193 | { ACTION_QS_DOWN, BUTTON_RC_VOL_DOWN, BUTTON_NONE }, | ||
194 | { ACTION_QS_DOWN, BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | ||
195 | { ACTION_QS_LEFT, BUTTON_RC_REW, BUTTON_NONE }, | ||
196 | { ACTION_QS_LEFT, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_NONE }, | ||
197 | { ACTION_QS_RIGHT, BUTTON_RC_FF, BUTTON_NONE }, | ||
198 | { ACTION_QS_RIGHT, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_NONE }, | ||
199 | |||
200 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | ||
201 | }; /* remote_button_context_quickscreen */ | ||
202 | |||
133 | const struct button_mapping button_context_settings_r_is_inc[] = { | 203 | const struct button_mapping button_context_settings_r_is_inc[] = { |
134 | { ACTION_SETTINGS_INC, BUTTON_RIGHT, BUTTON_NONE }, | 204 | { ACTION_SETTINGS_INC, BUTTON_RIGHT, BUTTON_NONE }, |
135 | { ACTION_SETTINGS_INCREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | 205 | { ACTION_SETTINGS_INCREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, |
@@ -159,52 +229,20 @@ const struct button_mapping button_context_pitchscreen[] = { | |||
159 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | 229 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
160 | }; /* button_context_pitchscreen */ | 230 | }; /* button_context_pitchscreen */ |
161 | 231 | ||
162 | 232 | const struct button_mapping remote_button_context_pitchscreen[] = { | |
163 | const struct button_mapping remote_button_context_standard[] = { | 233 | { ACTION_PS_INC_SMALL, BUTTON_RC_VOL_UP, BUTTON_NONE }, |
164 | { ACTION_STD_PREV, BUTTON_RC_REW, BUTTON_NONE }, | 234 | { ACTION_PS_INC_BIG, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, |
165 | { ACTION_STD_PREVREPEAT, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_NONE }, | 235 | { ACTION_PS_DEC_SMALL, BUTTON_RC_VOL_DOWN, BUTTON_NONE }, |
166 | { ACTION_STD_NEXT, BUTTON_RC_FF, BUTTON_NONE }, | 236 | { ACTION_PS_DEC_BIG, BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
167 | { ACTION_STD_NEXTREPEAT, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_NONE }, | 237 | { ACTION_PS_NUDGE_LEFT, BUTTON_RC_REW, BUTTON_NONE }, |
168 | 238 | { ACTION_PS_NUDGE_LEFTOFF, BUTTON_RC_REW|BUTTON_REL, BUTTON_NONE }, | |
169 | { ACTION_STD_CONTEXT, BUTTON_RC_PLAY|BUTTON_REPEAT, BUTTON_RC_PLAY }, | 239 | { ACTION_PS_NUDGE_RIGHT, BUTTON_RC_FF, BUTTON_NONE }, |
170 | { ACTION_STD_CANCEL, BUTTON_RC_MODE, BUTTON_NONE }, | 240 | { ACTION_PS_NUDGE_RIGHTOFF, BUTTON_RC_FF|BUTTON_REL, BUTTON_NONE }, |
171 | { ACTION_STD_OK, BUTTON_RC_PLAY|BUTTON_REL, BUTTON_RC_PLAY }, | 241 | { ACTION_PS_RESET, BUTTON_RC_MODE, BUTTON_NONE }, |
172 | { ACTION_STD_MENU, BUTTON_RC_MENU|BUTTON_REL, BUTTON_RC_MENU }, | 242 | { ACTION_PS_EXIT, BUTTON_RC_PLAY, BUTTON_NONE }, |
173 | { ACTION_STD_QUICKSCREEN,BUTTON_RC_MENU|BUTTON_REPEAT, BUTTON_RC_MENU }, | ||
174 | |||
175 | LAST_ITEM_IN_LIST | ||
176 | }; | ||
177 | |||
178 | const struct button_mapping remote_button_context_tree[] = { | ||
179 | { ACTION_TREE_WPS, BUTTON_RC_MODE|BUTTON_REL, BUTTON_RC_MODE }, | ||
180 | { ACTION_TREE_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, | ||
181 | |||
182 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | ||
183 | }; | ||
184 | |||
185 | const struct button_mapping remote_button_context_wps[] = { | ||
186 | { ACTION_WPS_PLAY, BUTTON_RC_PLAY|BUTTON_REL, BUTTON_RC_PLAY }, | ||
187 | { ACTION_WPS_STOP, BUTTON_RC_PLAY|BUTTON_REPEAT, BUTTON_RC_PLAY }, | ||
188 | { ACTION_WPS_SKIPPREV, BUTTON_RC_REW|BUTTON_REL, BUTTON_RC_REW }, | ||
189 | { ACTION_WPS_SEEKBACK, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_NONE }, | ||
190 | { ACTION_WPS_STOPSEEK, BUTTON_RC_REW|BUTTON_REL, BUTTON_RC_REW|BUTTON_REPEAT }, | ||
191 | { ACTION_WPS_SKIPNEXT, BUTTON_RC_FF|BUTTON_REL, BUTTON_RC_FF }, | ||
192 | { ACTION_WPS_SEEKFWD, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_NONE }, | ||
193 | { ACTION_WPS_STOPSEEK, BUTTON_RC_FF|BUTTON_REL, BUTTON_RC_FF|BUTTON_REPEAT }, | ||
194 | 243 | ||
195 | { ACTION_WPS_VOLDOWN, BUTTON_RC_VOL_DOWN, BUTTON_NONE }, | ||
196 | { ACTION_WPS_VOLDOWN, BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | ||
197 | { ACTION_WPS_VOLUP, BUTTON_RC_VOL_UP, BUTTON_NONE }, | ||
198 | { ACTION_WPS_VOLUP, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, | ||
199 | |||
200 | { ACTION_WPS_BROWSE, BUTTON_RC_MODE|BUTTON_REL, BUTTON_RC_MODE }, | ||
201 | { ACTION_WPS_CONTEXT, BUTTON_RC_MODE|BUTTON_REPEAT, BUTTON_RC_MODE }, | ||
202 | { ACTION_WPS_MENU, BUTTON_RC_MENU|BUTTON_REL, BUTTON_RC_MENU }, | ||
203 | { ACTION_WPS_QUICKSCREEN, BUTTON_RC_MENU|BUTTON_REPEAT, BUTTON_RC_MENU }, | ||
204 | |||
205 | |||
206 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | 244 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
207 | }; | 245 | }; /* remote_button_context_pitchscreen */ |
208 | 246 | ||
209 | const struct button_mapping button_context_recscreen[] = { | 247 | const struct button_mapping button_context_recscreen[] = { |
210 | { ACTION_REC_PAUSE, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, | 248 | { ACTION_REC_PAUSE, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, |
@@ -220,25 +258,26 @@ const struct button_mapping button_context_recscreen[] = { | |||
220 | }; /* button_context_recscreen */ | 258 | }; /* button_context_recscreen */ |
221 | 259 | ||
222 | const struct button_mapping button_context_keyboard[] = { | 260 | const struct button_mapping button_context_keyboard[] = { |
223 | { ACTION_KBD_LEFT, BUTTON_LEFT, BUTTON_NONE }, | 261 | { ACTION_KBD_LEFT, BUTTON_LEFT, BUTTON_NONE }, |
224 | { ACTION_KBD_LEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | 262 | { ACTION_KBD_LEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, |
225 | { ACTION_KBD_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, | 263 | { ACTION_KBD_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, |
226 | { ACTION_KBD_RIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | 264 | { ACTION_KBD_RIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, |
227 | { ACTION_KBD_UP, BUTTON_UP, BUTTON_NONE }, | 265 | { ACTION_KBD_UP, BUTTON_UP, BUTTON_NONE }, |
228 | { ACTION_KBD_UP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | 266 | { ACTION_KBD_UP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, |
229 | { ACTION_KBD_DOWN, BUTTON_DOWN, BUTTON_NONE }, | 267 | { ACTION_KBD_DOWN, BUTTON_DOWN, BUTTON_NONE }, |
230 | { ACTION_KBD_DOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 268 | { ACTION_KBD_DOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
231 | { ACTION_KBD_SELECT, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, | 269 | { ACTION_KBD_SELECT, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, |
232 | { ACTION_KBD_DONE, BUTTON_PLAY, BUTTON_NONE }, | 270 | { ACTION_KBD_DONE, BUTTON_PLAY, BUTTON_NONE }, |
233 | { ACTION_KBD_ABORT, BUTTON_REC, BUTTON_NONE }, | 271 | { ACTION_KBD_ABORT, BUTTON_REC, BUTTON_NONE }, |
234 | |||
235 | 272 | ||
236 | LAST_ITEM_IN_LIST | 273 | LAST_ITEM_IN_LIST |
237 | }; /* button_context_keyboard */ | 274 | }; /* button_context_keyboard */ |
275 | |||
238 | const struct button_mapping button_context_bmark[] = { | 276 | const struct button_mapping button_context_bmark[] = { |
239 | { ACTION_BMS_DELETE, BUTTON_REC|BUTTON_REPEAT, BUTTON_NONE }, | 277 | { ACTION_BMS_DELETE, BUTTON_REC|BUTTON_REPEAT, BUTTON_NONE }, |
240 | { ACTION_BMS_SELECT, BUTTON_SELECT, BUTTON_NONE }, | 278 | { ACTION_BMS_SELECT, BUTTON_SELECT, BUTTON_NONE }, |
241 | { ACTION_BMS_EXIT, BUTTON_REC|BUTTON_REL, BUTTON_NONE }, | 279 | { ACTION_BMS_EXIT, BUTTON_REC|BUTTON_REL, BUTTON_NONE }, |
280 | |||
242 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS), | 281 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS), |
243 | }; /* button_context_settings_bmark */ | 282 | }; /* button_context_settings_bmark */ |
244 | 283 | ||
@@ -251,8 +290,7 @@ const struct button_mapping button_context_radio[] = { | |||
251 | { ACTION_FM_PLAY, BUTTON_PLAY | BUTTON_REL, BUTTON_PLAY }, | 290 | { ACTION_FM_PLAY, BUTTON_PLAY | BUTTON_REL, BUTTON_PLAY }, |
252 | 291 | ||
253 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS) | 292 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS) |
254 | 293 | }; /* button_context_radio */ | |
255 | }; | ||
256 | 294 | ||
257 | static const struct button_mapping* get_context_mapping_remote( int context ) | 295 | static const struct button_mapping* get_context_mapping_remote( int context ) |
258 | { | 296 | { |
@@ -266,6 +304,15 @@ static const struct button_mapping* get_context_mapping_remote( int context ) | |||
266 | case CONTEXT_WPS: | 304 | case CONTEXT_WPS: |
267 | return remote_button_context_wps; | 305 | return remote_button_context_wps; |
268 | 306 | ||
307 | case CONTEXT_QUICKSCREEN: | ||
308 | return remote_button_context_quickscreen; | ||
309 | |||
310 | case CONTEXT_PITCHSCREEN: | ||
311 | return remote_button_context_pitchscreen; | ||
312 | |||
313 | case CONTEXT_MAINMENU: | ||
314 | return button_context_menu; | ||
315 | |||
269 | default: | 316 | default: |
270 | return remote_button_context_standard; | 317 | return remote_button_context_standard; |
271 | } | 318 | } |