diff options
author | Michael Sevakis <jethead71@rockbox.org> | 2006-10-12 17:49:46 +0000 |
---|---|---|
committer | Michael Sevakis <jethead71@rockbox.org> | 2006-10-12 17:49:46 +0000 |
commit | 6c9b1d46ee19f032014e5927e9e6ecd160aff70c (patch) | |
tree | b1575d88b2cd66c76a6c7e209ba8ed4d7c3af6f3 /apps | |
parent | e7da79fae409b3f7988593680ade96483b4e4516 (diff) | |
download | rockbox-6c9b1d46ee19f032014e5927e9e6ecd160aff70c.tar.gz rockbox-6c9b1d46ee19f032014e5927e9e6ecd160aff70c.zip |
Made EQ and color chooser buttons work with remote. Fixed the date/time screen mappings on main unit (no date/time settings are possible from remote yet). Rearranged mappings and switch statements into alphabetical order for easier reference.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11203 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r-- | apps/keymaps/keymap-x5.c | 466 |
1 files changed, 260 insertions, 206 deletions
diff --git a/apps/keymaps/keymap-x5.c b/apps/keymaps/keymap-x5.c index 082553c137..375baac721 100644 --- a/apps/keymaps/keymap-x5.c +++ b/apps/keymaps/keymap-x5.c | |||
@@ -35,13 +35,18 @@ CONTEXT_CUSTOM|CONTEXT_TREE = the standard list/tree defines (without directions | |||
35 | 35 | ||
36 | */ | 36 | */ |
37 | 37 | ||
38 | /** Keep things alphabetized for easy reference but standard contexts can | ||
39 | ** be first and sub-alphebetized. | ||
40 | **/ | ||
41 | |||
42 | /** Standard Button Contexts **/ | ||
38 | const struct button_mapping button_context_standard[] = { | 43 | const struct button_mapping button_context_standard[] = { |
39 | { ACTION_STD_PREV, BUTTON_UP, BUTTON_NONE }, | 44 | { ACTION_STD_PREV, BUTTON_UP, BUTTON_NONE }, |
40 | { ACTION_STD_PREVREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | 45 | { ACTION_STD_PREVREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, |
41 | { ACTION_STD_NEXT, BUTTON_DOWN, BUTTON_NONE }, | 46 | { ACTION_STD_NEXT, BUTTON_DOWN, BUTTON_NONE }, |
42 | { ACTION_STD_NEXTREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 47 | { ACTION_STD_NEXTREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
43 | 48 | ||
44 | { ACTION_STD_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, | 49 | { ACTION_STD_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, |
45 | { ACTION_STD_CANCEL, BUTTON_LEFT, BUTTON_NONE }, | 50 | { ACTION_STD_CANCEL, BUTTON_LEFT, BUTTON_NONE }, |
46 | { ACTION_STD_OK, BUTTON_RIGHT, BUTTON_NONE }, | 51 | { ACTION_STD_OK, BUTTON_RIGHT, BUTTON_NONE }, |
47 | { ACTION_STD_OK, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, | 52 | { ACTION_STD_OK, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, |
@@ -58,7 +63,7 @@ const struct button_mapping remote_button_context_standard[] = { | |||
58 | { ACTION_STD_PREVREPEAT, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_NONE }, | 63 | { ACTION_STD_PREVREPEAT, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_NONE }, |
59 | { ACTION_STD_NEXT, BUTTON_RC_FF, BUTTON_NONE }, | 64 | { ACTION_STD_NEXT, BUTTON_RC_FF, BUTTON_NONE }, |
60 | { ACTION_STD_NEXTREPEAT, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_NONE }, | 65 | { ACTION_STD_NEXTREPEAT, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_NONE }, |
61 | 66 | ||
62 | { ACTION_STD_CONTEXT, BUTTON_RC_PLAY|BUTTON_REPEAT, BUTTON_RC_PLAY }, | 67 | { ACTION_STD_CONTEXT, BUTTON_RC_PLAY|BUTTON_REPEAT, BUTTON_RC_PLAY }, |
63 | { ACTION_STD_CANCEL, BUTTON_RC_MODE, BUTTON_NONE }, | 68 | { ACTION_STD_CANCEL, BUTTON_RC_MODE, BUTTON_NONE }, |
64 | { ACTION_STD_OK, BUTTON_RC_PLAY|BUTTON_REL, BUTTON_RC_PLAY }, | 69 | { ACTION_STD_OK, BUTTON_RC_PLAY|BUTTON_REL, BUTTON_RC_PLAY }, |
@@ -68,111 +73,93 @@ const struct button_mapping remote_button_context_standard[] = { | |||
68 | LAST_ITEM_IN_LIST | 73 | LAST_ITEM_IN_LIST |
69 | }; /* remote_button_context_standard */ | 74 | }; /* remote_button_context_standard */ |
70 | 75 | ||
71 | const struct button_mapping button_context_wps[] = { | 76 | /** Bookmark Screen **/ |
72 | { ACTION_WPS_PLAY, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, | 77 | const struct button_mapping button_context_bmark[] = { |
73 | { ACTION_WPS_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, | 78 | { ACTION_BMS_DELETE, BUTTON_REC|BUTTON_REPEAT, BUTTON_NONE }, |
74 | { ACTION_WPS_SKIPPREV, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, | 79 | { ACTION_BMS_SELECT, BUTTON_SELECT, BUTTON_NONE }, |
75 | { ACTION_WPS_SEEKBACK, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | 80 | { ACTION_BMS_EXIT, BUTTON_REC|BUTTON_REL, BUTTON_NONE }, |
76 | { ACTION_WPS_STOPSEEK, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT|BUTTON_REPEAT }, | ||
77 | { ACTION_WPS_SKIPNEXT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, | ||
78 | { ACTION_WPS_SEEKFWD, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | ||
79 | { ACTION_WPS_STOPSEEK, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT|BUTTON_REPEAT }, | ||
80 | |||
81 | { ACTION_WPS_VOLDOWN, BUTTON_DOWN, BUTTON_NONE }, | ||
82 | { ACTION_WPS_VOLDOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | ||
83 | { ACTION_WPS_VOLUP, BUTTON_UP, BUTTON_NONE }, | ||
84 | { ACTION_WPS_VOLUP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | ||
85 | |||
86 | { ACTION_WPS_BROWSE, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, | ||
87 | { ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, | ||
88 | { ACTION_WPS_MENU, BUTTON_REC|BUTTON_REL, BUTTON_REC }, | ||
89 | { ACTION_WPS_QUICKSCREEN, BUTTON_REC|BUTTON_REPEAT, BUTTON_REC }, | ||
90 | 81 | ||
91 | LAST_ITEM_IN_LIST | 82 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS), |
92 | }; /* button_context_wps */ | 83 | }; /* button_context_settings_bmark */ |
93 | 84 | ||
94 | const struct button_mapping remote_button_context_wps[] = { | 85 | /** FM Radio Screen **/ |
95 | { ACTION_WPS_PLAY, BUTTON_RC_PLAY|BUTTON_REL, BUTTON_RC_PLAY }, | 86 | const struct button_mapping button_context_radio[] = { |
96 | { ACTION_WPS_STOP, BUTTON_RC_PLAY|BUTTON_REPEAT, BUTTON_RC_PLAY }, | 87 | { ACTION_FM_MENU, BUTTON_SELECT | BUTTON_REPEAT, BUTTON_NONE }, |
97 | { ACTION_WPS_SKIPPREV, BUTTON_RC_REW|BUTTON_REL, BUTTON_RC_REW }, | 88 | { ACTION_FM_PRESET, BUTTON_SELECT | BUTTON_REL, BUTTON_SELECT }, |
98 | { ACTION_WPS_SEEKBACK, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_NONE }, | 89 | { ACTION_FM_STOP, BUTTON_POWER, BUTTON_NONE }, |
99 | { ACTION_WPS_STOPSEEK, BUTTON_RC_REW|BUTTON_REL, BUTTON_RC_REW|BUTTON_REPEAT }, | 90 | { ACTION_FM_MODE, BUTTON_PLAY | BUTTON_REPEAT, BUTTON_PLAY }, |
100 | { ACTION_WPS_SKIPNEXT, BUTTON_RC_FF|BUTTON_REL, BUTTON_RC_FF }, | 91 | { ACTION_FM_EXIT, BUTTON_REC | BUTTON_REL, BUTTON_REC }, |
101 | { ACTION_WPS_SEEKFWD, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_NONE }, | 92 | { ACTION_FM_PLAY, BUTTON_PLAY | BUTTON_REL, BUTTON_PLAY }, |
102 | { ACTION_WPS_STOPSEEK, BUTTON_RC_FF|BUTTON_REL, BUTTON_RC_FF|BUTTON_REPEAT }, | 93 | { ACTION_STD_PREVREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, |
103 | 94 | { ACTION_STD_NEXT, BUTTON_RIGHT, BUTTON_NONE }, | |
104 | { ACTION_WPS_VOLDOWN, BUTTON_RC_VOL_DOWN, BUTTON_NONE }, | 95 | { ACTION_STD_NEXTREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, 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 */ | ||
116 | 96 | ||
117 | const struct button_mapping button_context_settings[] = { | 97 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS) |
118 | { ACTION_SETTINGS_INC, BUTTON_UP, BUTTON_NONE }, | 98 | }; /* button_context_radio */ |
119 | { ACTION_SETTINGS_INCREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | ||
120 | { ACTION_SETTINGS_DEC, BUTTON_DOWN, BUTTON_NONE }, | ||
121 | { ACTION_SETTINGS_DECREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | ||
122 | { ACTION_STD_PREV, BUTTON_LEFT, BUTTON_NONE }, | ||
123 | { ACTION_STD_CANCEL, BUTTON_REC, BUTTON_NONE }, | ||
124 | 99 | ||
125 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | 100 | /** Keyboard **/ |
126 | }; /* button_context_settings */ | 101 | const struct button_mapping button_context_keyboard[] = { |
102 | { ACTION_KBD_LEFT, BUTTON_LEFT, BUTTON_NONE }, | ||
103 | { ACTION_KBD_LEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | ||
104 | { ACTION_KBD_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, | ||
105 | { ACTION_KBD_RIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | ||
106 | { ACTION_KBD_UP, BUTTON_UP, BUTTON_NONE }, | ||
107 | { ACTION_KBD_UP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | ||
108 | { ACTION_KBD_DOWN, BUTTON_DOWN, BUTTON_NONE }, | ||
109 | { ACTION_KBD_DOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | ||
110 | { ACTION_KBD_SELECT, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, | ||
111 | { ACTION_KBD_DONE, BUTTON_PLAY, BUTTON_NONE }, | ||
112 | { ACTION_KBD_ABORT, BUTTON_REC, BUTTON_NONE }, | ||
113 | |||
114 | LAST_ITEM_IN_LIST | ||
115 | }; /* button_context_keyboard */ | ||
127 | 116 | ||
128 | const struct button_mapping button_context_menu[] = { | 117 | /* Main Menu Context Menu **/ |
118 | const struct button_mapping button_context_mainmenu[] = { | ||
129 | { ACTION_NONE, BUTTON_POWER, BUTTON_NONE }, | 119 | { ACTION_NONE, BUTTON_POWER, BUTTON_NONE }, |
130 | 120 | ||
131 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | 121 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
132 | }; /* button_context_menu */ | 122 | }; /* button_context_mainmenu */ |
133 | 123 | ||
134 | const struct button_mapping remote_button_context_menu[] = { | 124 | const struct button_mapping remote_button_context_mainmenu[] = { |
135 | { ACTION_STD_CANCEL, BUTTON_RC_VOL_DOWN, BUTTON_NONE }, | 125 | { ACTION_STD_CANCEL, BUTTON_RC_VOL_DOWN, BUTTON_NONE }, |
136 | { ACTION_STD_OK, BUTTON_RC_VOL_UP, BUTTON_NONE }, | 126 | { ACTION_STD_OK, BUTTON_RC_VOL_UP, BUTTON_NONE }, |
137 | 127 | ||
138 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | 128 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
139 | }; /* remote_button_context_menu */ | 129 | }; /* remote_button_context_mainmenu */ |
140 | 130 | ||
141 | const struct button_mapping button_context_tree[] = { | 131 | /** Pitchscreen **/ |
142 | { ACTION_NONE, BUTTON_PLAY, BUTTON_NONE }, | 132 | const struct button_mapping button_context_pitchscreen[] = { |
143 | { ACTION_TREE_WPS, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, | 133 | { ACTION_PS_INC_SMALL, BUTTON_UP, BUTTON_NONE }, |
144 | { ACTION_TREE_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, | 134 | { ACTION_PS_INC_BIG, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, |
145 | 135 | { ACTION_PS_DEC_SMALL, BUTTON_DOWN, BUTTON_NONE }, | |
146 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | 136 | { ACTION_PS_DEC_BIG, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
147 | }; /* button_context_tree */ | 137 | { ACTION_PS_NUDGE_LEFT, BUTTON_LEFT, BUTTON_NONE }, |
138 | { ACTION_PS_NUDGE_LEFTOFF, BUTTON_LEFT|BUTTON_REL, BUTTON_NONE }, | ||
139 | { ACTION_PS_NUDGE_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, | ||
140 | { ACTION_PS_NUDGE_RIGHTOFF, BUTTON_RIGHT|BUTTON_REL, BUTTON_NONE }, | ||
141 | { ACTION_PS_RESET, BUTTON_POWER, BUTTON_NONE }, | ||
142 | { ACTION_PS_EXIT, BUTTON_PLAY, BUTTON_NONE }, | ||
148 | 143 | ||
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 | |||
155 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | 144 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
156 | }; /* remote_button_context_tree */ | 145 | }; /* button_context_pitchscreen */ |
157 | 146 | ||
158 | const struct button_mapping button_context_tree_scroll_lr[] = { | 147 | const struct button_mapping remote_button_context_pitchscreen[] = { |
159 | { ACTION_NONE, BUTTON_LEFT, BUTTON_NONE }, | 148 | { ACTION_PS_INC_SMALL, BUTTON_RC_VOL_UP, BUTTON_NONE }, |
160 | { ACTION_STD_CANCEL, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, | 149 | { ACTION_PS_INC_BIG, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, |
161 | { ACTION_TREE_ROOT_INIT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT }, | 150 | { ACTION_PS_DEC_SMALL, BUTTON_RC_VOL_DOWN, BUTTON_NONE }, |
162 | { ACTION_TREE_PGLEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | 151 | { ACTION_PS_DEC_BIG, BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
163 | { ACTION_TREE_PGLEFT, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT|BUTTON_REPEAT }, | 152 | { ACTION_PS_NUDGE_LEFT, BUTTON_RC_REW, BUTTON_NONE }, |
164 | { ACTION_NONE, BUTTON_RIGHT, BUTTON_NONE }, | 153 | { ACTION_PS_NUDGE_LEFTOFF, BUTTON_RC_REW|BUTTON_REL, BUTTON_NONE }, |
165 | { ACTION_STD_OK, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, | 154 | { ACTION_PS_NUDGE_RIGHT, BUTTON_RC_FF, BUTTON_NONE }, |
166 | { ACTION_TREE_PGRIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | 155 | { ACTION_PS_NUDGE_RIGHTOFF, BUTTON_RC_FF|BUTTON_REL, BUTTON_NONE }, |
167 | { ACTION_TREE_PGRIGHT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT|BUTTON_REPEAT }, | 156 | { ACTION_PS_RESET, BUTTON_RC_MODE, BUTTON_NONE }, |
168 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE), | 157 | { ACTION_PS_EXIT, BUTTON_RC_PLAY, BUTTON_NONE }, |
169 | }; /* button_context_tree_scroll_lr */ | ||
170 | 158 | ||
171 | const struct button_mapping button_context_yesno[] = { | 159 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
172 | { ACTION_YESNO_ACCEPT, BUTTON_SELECT, BUTTON_NONE }, | 160 | }; /* remote_button_context_pitchscreen */ |
173 | LAST_ITEM_IN_LIST | ||
174 | }; /* button_context_settings_yesno */ | ||
175 | 161 | ||
162 | /** Quickscreen **/ | ||
176 | const struct button_mapping button_context_quickscreen[] = { | 163 | const struct button_mapping button_context_quickscreen[] = { |
177 | { ACTION_QS_DOWNINV, BUTTON_UP, BUTTON_NONE }, | 164 | { ACTION_QS_DOWNINV, BUTTON_UP, BUTTON_NONE }, |
178 | { ACTION_QS_DOWNINV, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | 165 | { ACTION_QS_DOWNINV, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, |
@@ -183,7 +170,7 @@ const struct button_mapping button_context_quickscreen[] = { | |||
183 | { ACTION_QS_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, | 170 | { ACTION_QS_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, |
184 | { ACTION_QS_RIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | 171 | { ACTION_QS_RIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, |
185 | { ACTION_STD_CANCEL, BUTTON_REC, BUTTON_NONE }, | 172 | { ACTION_STD_CANCEL, BUTTON_REC, BUTTON_NONE }, |
186 | 173 | ||
187 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | 174 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
188 | }; /* button_context_quickscreen */ | 175 | }; /* button_context_quickscreen */ |
189 | 176 | ||
@@ -196,10 +183,37 @@ const struct button_mapping remote_button_context_quickscreen[] = { | |||
196 | { ACTION_QS_LEFT, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_NONE }, | 183 | { ACTION_QS_LEFT, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_NONE }, |
197 | { ACTION_QS_RIGHT, BUTTON_RC_FF, BUTTON_NONE }, | 184 | { ACTION_QS_RIGHT, BUTTON_RC_FF, BUTTON_NONE }, |
198 | { ACTION_QS_RIGHT, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_NONE }, | 185 | { ACTION_QS_RIGHT, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_NONE }, |
199 | 186 | ||
200 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | 187 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
201 | }; /* remote_button_context_quickscreen */ | 188 | }; /* remote_button_context_quickscreen */ |
202 | 189 | ||
190 | /** Recording Screen **/ | ||
191 | const struct button_mapping button_context_recscreen[] = { | ||
192 | { ACTION_REC_PAUSE, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, | ||
193 | { ACTION_STD_CANCEL, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, | ||
194 | { ACTION_REC_NEWFILE, BUTTON_REC|BUTTON_REL, BUTTON_REC }, | ||
195 | { ACTION_STD_MENU, BUTTON_REC|BUTTON_REPEAT, BUTTON_REC }, | ||
196 | { ACTION_SETTINGS_INC, BUTTON_RIGHT, BUTTON_NONE }, | ||
197 | { ACTION_SETTINGS_INC, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | ||
198 | { ACTION_SETTINGS_DEC, BUTTON_LEFT, BUTTON_NONE }, | ||
199 | { ACTION_SETTINGS_DEC, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | ||
200 | |||
201 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | ||
202 | }; /* button_context_recscreen */ | ||
203 | |||
204 | /** Settings - General Mappings **/ | ||
205 | const struct button_mapping button_context_settings[] = { | ||
206 | { ACTION_SETTINGS_INC, BUTTON_UP, BUTTON_NONE }, | ||
207 | { ACTION_SETTINGS_INCREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | ||
208 | { ACTION_SETTINGS_DEC, BUTTON_DOWN, BUTTON_NONE }, | ||
209 | { ACTION_SETTINGS_DECREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | ||
210 | { ACTION_STD_PREV, BUTTON_LEFT, BUTTON_NONE }, | ||
211 | { ACTION_STD_CANCEL, BUTTON_REC, BUTTON_NONE }, | ||
212 | |||
213 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | ||
214 | }; /* button_context_settings */ | ||
215 | |||
216 | /** Settings - Using Sliders **/ | ||
203 | const struct button_mapping button_context_settings_r_is_inc[] = { | 217 | const struct button_mapping button_context_settings_r_is_inc[] = { |
204 | { ACTION_SETTINGS_INC, BUTTON_RIGHT, BUTTON_NONE }, | 218 | { ACTION_SETTINGS_INC, BUTTON_RIGHT, BUTTON_NONE }, |
205 | { ACTION_SETTINGS_INCREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | 219 | { ACTION_SETTINGS_INCREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, |
@@ -210,166 +224,206 @@ const struct button_mapping button_context_settings_r_is_inc[] = { | |||
210 | { ACTION_STD_NEXT, BUTTON_DOWN, BUTTON_NONE }, | 224 | { ACTION_STD_NEXT, BUTTON_DOWN, BUTTON_NONE }, |
211 | { ACTION_STD_NEXTREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 225 | { ACTION_STD_NEXTREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
212 | { ACTION_STD_CANCEL, BUTTON_REC, BUTTON_NONE }, | 226 | { ACTION_STD_CANCEL, BUTTON_REC, BUTTON_NONE }, |
213 | 227 | ||
214 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | 228 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
215 | }; /* button_context_settingsgraphical */ | 229 | }; /* button_context_settings_r_is_inc */ |
230 | |||
231 | const struct button_mapping remote_button_context_settings_r_is_inc[] = { | ||
232 | { ACTION_SETTINGS_INC, BUTTON_RC_VOL_UP, BUTTON_NONE }, | ||
233 | { ACTION_SETTINGS_INCREPEAT, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, | ||
234 | { ACTION_SETTINGS_DEC, BUTTON_RC_VOL_DOWN, BUTTON_NONE }, | ||
235 | { ACTION_SETTINGS_DECREPEAT, BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | ||
236 | { ACTION_STD_PREV, BUTTON_RC_REW, BUTTON_NONE }, | ||
237 | { ACTION_STD_PREVREPEAT, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_NONE }, | ||
238 | { ACTION_STD_NEXT, BUTTON_RC_FF, BUTTON_NONE }, | ||
239 | { ACTION_STD_NEXTREPEAT, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_NONE }, | ||
216 | 240 | ||
217 | const struct button_mapping button_context_pitchscreen[] = { | ||
218 | { ACTION_PS_INC_SMALL, BUTTON_UP, BUTTON_NONE }, | ||
219 | { ACTION_PS_INC_BIG, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | ||
220 | { ACTION_PS_DEC_SMALL, BUTTON_DOWN, BUTTON_NONE }, | ||
221 | { ACTION_PS_DEC_BIG, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | ||
222 | { ACTION_PS_NUDGE_LEFT, BUTTON_LEFT, BUTTON_NONE }, | ||
223 | { ACTION_PS_NUDGE_LEFTOFF, BUTTON_LEFT|BUTTON_REL, BUTTON_NONE }, | ||
224 | { ACTION_PS_NUDGE_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, | ||
225 | { ACTION_PS_NUDGE_RIGHTOFF, BUTTON_RIGHT|BUTTON_REL, BUTTON_NONE }, | ||
226 | { ACTION_PS_RESET, BUTTON_POWER, BUTTON_NONE }, | ||
227 | { ACTION_PS_EXIT, BUTTON_PLAY, BUTTON_NONE }, | ||
228 | |||
229 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | 241 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
230 | }; /* button_context_pitchscreen */ | 242 | }; /* remote_button_context_settings_r_is_inc */ |
243 | |||
244 | /** Settings - Time/Date **/ | ||
245 | const struct button_mapping button_context_settings_time[] = { | ||
246 | { ACTION_STD_PREVREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | ||
247 | { ACTION_STD_NEXT, BUTTON_RIGHT, BUTTON_NONE }, | ||
248 | { ACTION_STD_NEXTREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | ||
249 | |||
250 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS) | ||
251 | }; /* button_context_settings */ | ||
252 | |||
253 | /** Tree **/ | ||
254 | const struct button_mapping button_context_tree[] = { | ||
255 | { ACTION_NONE, BUTTON_PLAY, BUTTON_NONE }, | ||
256 | { ACTION_TREE_WPS, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, | ||
257 | { ACTION_TREE_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, | ||
231 | 258 | ||
232 | const struct button_mapping remote_button_context_pitchscreen[] = { | ||
233 | { ACTION_PS_INC_SMALL, BUTTON_RC_VOL_UP, BUTTON_NONE }, | ||
234 | { ACTION_PS_INC_BIG, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, | ||
235 | { ACTION_PS_DEC_SMALL, BUTTON_RC_VOL_DOWN, BUTTON_NONE }, | ||
236 | { ACTION_PS_DEC_BIG, BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | ||
237 | { ACTION_PS_NUDGE_LEFT, BUTTON_RC_REW, BUTTON_NONE }, | ||
238 | { ACTION_PS_NUDGE_LEFTOFF, BUTTON_RC_REW|BUTTON_REL, BUTTON_NONE }, | ||
239 | { ACTION_PS_NUDGE_RIGHT, BUTTON_RC_FF, BUTTON_NONE }, | ||
240 | { ACTION_PS_NUDGE_RIGHTOFF, BUTTON_RC_FF|BUTTON_REL, BUTTON_NONE }, | ||
241 | { ACTION_PS_RESET, BUTTON_RC_MODE, BUTTON_NONE }, | ||
242 | { ACTION_PS_EXIT, BUTTON_RC_PLAY, BUTTON_NONE }, | ||
243 | |||
244 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | 259 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
245 | }; /* remote_button_context_pitchscreen */ | 260 | }; /* button_context_tree */ |
261 | |||
262 | const struct button_mapping remote_button_context_tree[] = { | ||
263 | { ACTION_STD_CANCEL, BUTTON_RC_VOL_DOWN, BUTTON_NONE }, | ||
264 | { ACTION_STD_OK, BUTTON_RC_VOL_UP, BUTTON_NONE }, | ||
265 | { ACTION_NONE, BUTTON_RC_MODE, BUTTON_NONE }, | ||
266 | { ACTION_TREE_WPS, BUTTON_RC_MODE|BUTTON_REL, BUTTON_RC_MODE }, | ||
246 | 267 | ||
247 | const struct button_mapping button_context_recscreen[] = { | ||
248 | { ACTION_REC_PAUSE, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, | ||
249 | { ACTION_STD_CANCEL, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, | ||
250 | { ACTION_REC_NEWFILE, BUTTON_REC|BUTTON_REL, BUTTON_REC }, | ||
251 | { ACTION_STD_MENU, BUTTON_REC|BUTTON_REPEAT, BUTTON_REC }, | ||
252 | { ACTION_SETTINGS_INC, BUTTON_RIGHT, BUTTON_NONE }, | ||
253 | { ACTION_SETTINGS_INC, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | ||
254 | { ACTION_SETTINGS_DEC, BUTTON_LEFT, BUTTON_NONE }, | ||
255 | { ACTION_SETTINGS_DEC, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | ||
256 | |||
257 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | 268 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
258 | }; /* button_context_recscreen */ | 269 | }; /* remote_button_context_tree */ |
259 | 270 | ||
260 | const struct button_mapping button_context_keyboard[] = { | 271 | const struct button_mapping button_context_tree_scroll_lr[] = { |
261 | { ACTION_KBD_LEFT, BUTTON_LEFT, BUTTON_NONE }, | 272 | { ACTION_NONE, BUTTON_LEFT, BUTTON_NONE }, |
262 | { ACTION_KBD_LEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | 273 | { ACTION_STD_CANCEL, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, |
263 | { ACTION_KBD_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, | 274 | { ACTION_TREE_ROOT_INIT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT }, |
264 | { ACTION_KBD_RIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | 275 | { ACTION_TREE_PGLEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, |
265 | { ACTION_KBD_UP, BUTTON_UP, BUTTON_NONE }, | 276 | { ACTION_TREE_PGLEFT, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT|BUTTON_REPEAT }, |
266 | { ACTION_KBD_UP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | 277 | { ACTION_NONE, BUTTON_RIGHT, BUTTON_NONE }, |
267 | { ACTION_KBD_DOWN, BUTTON_DOWN, BUTTON_NONE }, | 278 | { ACTION_STD_OK, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, |
268 | { ACTION_KBD_DOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 279 | { ACTION_TREE_PGRIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, |
269 | { ACTION_KBD_SELECT, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, | 280 | { ACTION_TREE_PGRIGHT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT|BUTTON_REPEAT }, |
270 | { ACTION_KBD_DONE, BUTTON_PLAY, BUTTON_NONE }, | 281 | |
271 | { ACTION_KBD_ABORT, BUTTON_REC, BUTTON_NONE }, | 282 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE), |
283 | }; /* button_context_tree_scroll_lr */ | ||
284 | |||
285 | /** While-Playing Screen (WPS) **/ | ||
286 | const struct button_mapping button_context_wps[] = { | ||
287 | { ACTION_WPS_PLAY, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, | ||
288 | { ACTION_WPS_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, | ||
289 | { ACTION_WPS_SKIPPREV, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, | ||
290 | { ACTION_WPS_SEEKBACK, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | ||
291 | { ACTION_WPS_STOPSEEK, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT|BUTTON_REPEAT }, | ||
292 | { ACTION_WPS_SKIPNEXT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, | ||
293 | { ACTION_WPS_SEEKFWD, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | ||
294 | { ACTION_WPS_STOPSEEK, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT|BUTTON_REPEAT }, | ||
295 | |||
296 | { ACTION_WPS_VOLDOWN, BUTTON_DOWN, BUTTON_NONE }, | ||
297 | { ACTION_WPS_VOLDOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | ||
298 | { ACTION_WPS_VOLUP, BUTTON_UP, BUTTON_NONE }, | ||
299 | { ACTION_WPS_VOLUP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | ||
300 | |||
301 | { ACTION_WPS_BROWSE, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, | ||
302 | { ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, | ||
303 | { ACTION_WPS_MENU, BUTTON_REC|BUTTON_REL, BUTTON_REC }, | ||
304 | { ACTION_WPS_QUICKSCREEN, BUTTON_REC|BUTTON_REPEAT, BUTTON_REC }, | ||
272 | 305 | ||
273 | LAST_ITEM_IN_LIST | 306 | LAST_ITEM_IN_LIST |
274 | }; /* button_context_keyboard */ | 307 | }; /* button_context_wps */ |
275 | 308 | ||
276 | const struct button_mapping button_context_bmark[] = { | 309 | const struct button_mapping remote_button_context_wps[] = { |
277 | { ACTION_BMS_DELETE, BUTTON_REC|BUTTON_REPEAT, BUTTON_NONE }, | 310 | { ACTION_WPS_PLAY, BUTTON_RC_PLAY|BUTTON_REL, BUTTON_RC_PLAY }, |
278 | { ACTION_BMS_SELECT, BUTTON_SELECT, BUTTON_NONE }, | 311 | { ACTION_WPS_STOP, BUTTON_RC_PLAY|BUTTON_REPEAT, BUTTON_RC_PLAY }, |
279 | { ACTION_BMS_EXIT, BUTTON_REC|BUTTON_REL, BUTTON_NONE }, | 312 | { ACTION_WPS_SKIPPREV, BUTTON_RC_REW|BUTTON_REL, BUTTON_RC_REW }, |
313 | { ACTION_WPS_SEEKBACK, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_NONE }, | ||
314 | { ACTION_WPS_STOPSEEK, BUTTON_RC_REW|BUTTON_REL, BUTTON_RC_REW|BUTTON_REPEAT }, | ||
315 | { ACTION_WPS_SKIPNEXT, BUTTON_RC_FF|BUTTON_REL, BUTTON_RC_FF }, | ||
316 | { ACTION_WPS_SEEKFWD, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_NONE }, | ||
317 | { ACTION_WPS_STOPSEEK, BUTTON_RC_FF|BUTTON_REL, BUTTON_RC_FF|BUTTON_REPEAT }, | ||
280 | 318 | ||
281 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS), | 319 | { ACTION_WPS_VOLDOWN, BUTTON_RC_VOL_DOWN, BUTTON_NONE }, |
282 | }; /* button_context_settings_bmark */ | 320 | { ACTION_WPS_VOLDOWN, BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
321 | { ACTION_WPS_VOLUP, BUTTON_RC_VOL_UP, BUTTON_NONE }, | ||
322 | { ACTION_WPS_VOLUP, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, | ||
283 | 323 | ||
284 | const struct button_mapping button_context_radio[] = { | 324 | { ACTION_WPS_BROWSE, BUTTON_RC_MODE|BUTTON_REL, BUTTON_RC_MODE }, |
285 | { ACTION_FM_MENU, BUTTON_SELECT | BUTTON_REPEAT, BUTTON_NONE }, | 325 | { ACTION_WPS_CONTEXT, BUTTON_RC_MODE|BUTTON_REPEAT, BUTTON_RC_MODE }, |
286 | { ACTION_FM_PRESET, BUTTON_SELECT | BUTTON_REL, BUTTON_SELECT }, | 326 | { ACTION_WPS_MENU, BUTTON_RC_MENU|BUTTON_REL, BUTTON_RC_MENU }, |
287 | { ACTION_FM_STOP, BUTTON_POWER, BUTTON_NONE }, | 327 | { ACTION_WPS_QUICKSCREEN, BUTTON_RC_MENU|BUTTON_REPEAT, BUTTON_RC_MENU }, |
288 | { ACTION_FM_MODE, BUTTON_PLAY | BUTTON_REPEAT, BUTTON_PLAY }, | ||
289 | { ACTION_FM_EXIT, BUTTON_REC | BUTTON_REL, BUTTON_REC }, | ||
290 | { ACTION_FM_PLAY, BUTTON_PLAY | BUTTON_REL, BUTTON_PLAY }, | ||
291 | { ACTION_STD_PREVREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | ||
292 | { ACTION_STD_NEXT, BUTTON_RIGHT, BUTTON_NONE }, | ||
293 | { ACTION_STD_NEXTREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | ||
294 | 328 | ||
295 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS) | 329 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
296 | }; /* button_context_radio */ | 330 | }; /* remote_button_context_wps */ |
331 | |||
332 | /** Yes/No Screen **/ | ||
333 | const struct button_mapping button_context_yesnoscreen[] = { | ||
334 | { ACTION_YESNO_ACCEPT, BUTTON_SELECT, BUTTON_NONE }, | ||
335 | LAST_ITEM_IN_LIST | ||
336 | }; /* button_context_settings_yesnoscreen */ | ||
297 | 337 | ||
298 | static const struct button_mapping* get_context_mapping_remote( int context ) | 338 | static const struct button_mapping* get_context_mapping_remote( int context ) |
299 | { | 339 | { |
300 | context ^= CONTEXT_REMOTE; | 340 | context ^= CONTEXT_REMOTE; |
301 | 341 | ||
302 | switch (context) | 342 | switch (context) |
303 | { | 343 | { |
304 | case CONTEXT_TREE: | 344 | /* anything that uses remote_button_context_standard */ |
305 | return remote_button_context_tree; | 345 | default: |
346 | return remote_button_context_standard; | ||
306 | 347 | ||
307 | case CONTEXT_WPS: | 348 | /* remote contexts with special mapping */ |
308 | return remote_button_context_wps; | 349 | case CONTEXT_MAINMENU: |
350 | return remote_button_context_mainmenu; | ||
351 | |||
352 | case CONTEXT_PITCHSCREEN: | ||
353 | return remote_button_context_pitchscreen; | ||
309 | 354 | ||
310 | case CONTEXT_QUICKSCREEN: | 355 | case CONTEXT_QUICKSCREEN: |
311 | return remote_button_context_quickscreen; | 356 | return remote_button_context_quickscreen; |
312 | 357 | ||
313 | case CONTEXT_PITCHSCREEN: | 358 | case CONTEXT_SETTINGS_COLOURCHOOSER: |
314 | return remote_button_context_pitchscreen; | 359 | case CONTEXT_SETTINGS_EQ: |
360 | case CONTEXT_SETTINGS_TIME: | ||
361 | return remote_button_context_settings_r_is_inc; | ||
315 | 362 | ||
316 | case CONTEXT_MAINMENU: | 363 | case CONTEXT_TREE: |
317 | return button_context_menu; | 364 | return remote_button_context_tree; |
318 | 365 | ||
319 | default: | 366 | case CONTEXT_WPS: |
320 | return remote_button_context_standard; | 367 | return remote_button_context_wps; |
321 | } | 368 | } |
322 | } | 369 | } |
323 | 370 | ||
324 | const struct button_mapping* get_context_mapping( int context ) | 371 | const struct button_mapping* get_context_mapping( int context ) |
325 | { | 372 | { |
326 | if (context&CONTEXT_REMOTE) | 373 | if (context & CONTEXT_REMOTE) |
327 | return get_context_mapping_remote(context); | 374 | return get_context_mapping_remote(context); |
328 | 375 | ||
329 | switch( context ) | 376 | switch( context ) |
330 | { | 377 | { |
378 | /* anything that uses button_context_standard */ | ||
379 | case CONTEXT_LIST: | ||
331 | case CONTEXT_STD: | 380 | case CONTEXT_STD: |
381 | default: | ||
332 | return button_context_standard; | 382 | return button_context_standard; |
333 | |||
334 | case CONTEXT_WPS: | ||
335 | return button_context_wps; | ||
336 | 383 | ||
337 | case CONTEXT_SETTINGS_EQ: | 384 | /* contexts with special mapping */ |
338 | case CONTEXT_SETTINGS_COLOURCHOOSER: | 385 | case CONTEXT_BOOKMARKSCREEN: |
339 | case CONTEXT_SETTINGS_TIME: | 386 | return button_context_bmark; |
340 | return button_context_settings_r_is_inc; | 387 | |
388 | case CONTEXT_FM: | ||
389 | return button_context_radio; | ||
390 | |||
391 | case CONTEXT_KEYBOARD: | ||
392 | return button_context_keyboard; | ||
393 | |||
394 | case CONTEXT_MAINMENU: | ||
395 | return button_context_mainmenu; | ||
396 | |||
397 | case CONTEXT_PITCHSCREEN: | ||
398 | return button_context_pitchscreen; | ||
399 | |||
400 | case CONTEXT_QUICKSCREEN: | ||
401 | return button_context_quickscreen; | ||
402 | |||
403 | case CONTEXT_RECSCREEN: | ||
404 | return button_context_recscreen; | ||
341 | 405 | ||
342 | case CONTEXT_SETTINGS: | 406 | case CONTEXT_SETTINGS: |
343 | return button_context_settings; | 407 | return button_context_settings; |
344 | 408 | ||
345 | case CONTEXT_YESNOSCREEN: | 409 | case CONTEXT_SETTINGS_COLOURCHOOSER: |
346 | return button_context_yesno; | 410 | case CONTEXT_SETTINGS_EQ: |
347 | 411 | return button_context_settings_r_is_inc; | |
412 | |||
413 | case CONTEXT_SETTINGS_TIME: | ||
414 | return button_context_settings_time; | ||
415 | |||
348 | case CONTEXT_TREE: | 416 | case CONTEXT_TREE: |
349 | if (global_settings.hold_lr_for_scroll_in_list) | 417 | if (global_settings.hold_lr_for_scroll_in_list) |
350 | return button_context_tree_scroll_lr; | 418 | return button_context_tree_scroll_lr; |
351 | /* else fall through to CUSTOM|CONTEXT_TREE */ | 419 | /* else fall through to CONTEXT_TREE|CONTEXT_CUSTOM */ |
352 | case CONTEXT_CUSTOM|CONTEXT_TREE | 420 | case CONTEXT_TREE|CONTEXT_CUSTOM: |
353 | : | ||
354 | return button_context_tree; | 421 | return button_context_tree; |
355 | case CONTEXT_QUICKSCREEN: | ||
356 | return button_context_quickscreen; | ||
357 | case CONTEXT_PITCHSCREEN: | ||
358 | return button_context_pitchscreen; | ||
359 | case CONTEXT_RECSCREEN: | ||
360 | return button_context_recscreen; | ||
361 | case CONTEXT_KEYBOARD: | ||
362 | return button_context_keyboard; | ||
363 | case CONTEXT_BOOKMARKSCREEN: | ||
364 | return button_context_bmark; | ||
365 | case CONTEXT_FM: | ||
366 | return button_context_radio; | ||
367 | 422 | ||
368 | case CONTEXT_MAINMENU: | 423 | case CONTEXT_WPS: |
369 | return button_context_menu; | 424 | return button_context_wps; |
370 | 425 | ||
371 | case CONTEXT_LIST: | 426 | case CONTEXT_YESNOSCREEN: |
372 | default: | 427 | return button_context_yesnoscreen; |
373 | return button_context_standard; | ||
374 | } | 428 | } |
375 | } | 429 | } |