diff options
author | Johannes Schwarz <ubuntuxer@rockbox.org> | 2009-06-20 21:51:18 +0000 |
---|---|---|
committer | Johannes Schwarz <ubuntuxer@rockbox.org> | 2009-06-20 21:51:18 +0000 |
commit | d48592596fed9d3e88b225ad8a592b90c35fbdcf (patch) | |
tree | 8036113083fc2029058f6d29681ad7da40e7d0c8 /apps/plugins | |
parent | fa4135e43db182f6278ff9f28d074e5b97182c1f (diff) | |
download | rockbox-d48592596fed9d3e88b225ad8a592b90c35fbdcf.tar.gz rockbox-d48592596fed9d3e88b225ad8a592b90c35fbdcf.zip |
Remove viewport menu from star and remove useless button macros in code.(FS#10281)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21422 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins')
-rw-r--r-- | apps/plugins/star.c | 44 |
1 files changed, 2 insertions, 42 deletions
diff --git a/apps/plugins/star.c b/apps/plugins/star.c index 880bcdebe3..4bb3afcbd5 100644 --- a/apps/plugins/star.c +++ b/apps/plugins/star.c | |||
@@ -66,9 +66,6 @@ PLUGIN_HEADER | |||
66 | #define STAR_LEVEL_UP BUTTON_F3 | 66 | #define STAR_LEVEL_UP BUTTON_F3 |
67 | #define STAR_LEVEL_DOWN BUTTON_F1 | 67 | #define STAR_LEVEL_DOWN BUTTON_F1 |
68 | #define STAR_LEVEL_REPEAT BUTTON_F2 | 68 | #define STAR_LEVEL_REPEAT BUTTON_F2 |
69 | #define STAR_MENU_RUN BUTTON_PLAY | ||
70 | #define STAR_MENU_RUN2 BUTTON_RIGHT | ||
71 | #define STAR_MENU_RUN3 BUTTON_ON | ||
72 | 69 | ||
73 | #elif CONFIG_KEYPAD == ARCHOS_AV300_PAD | 70 | #elif CONFIG_KEYPAD == ARCHOS_AV300_PAD |
74 | #define STAR_QUIT BUTTON_OFF | 71 | #define STAR_QUIT BUTTON_OFF |
@@ -81,9 +78,6 @@ PLUGIN_HEADER | |||
81 | #define STAR_LEVEL_UP BUTTON_F3 | 78 | #define STAR_LEVEL_UP BUTTON_F3 |
82 | #define STAR_LEVEL_DOWN BUTTON_F1 | 79 | #define STAR_LEVEL_DOWN BUTTON_F1 |
83 | #define STAR_LEVEL_REPEAT BUTTON_F2 | 80 | #define STAR_LEVEL_REPEAT BUTTON_F2 |
84 | #define STAR_MENU_RUN BUTTON_SELECT | ||
85 | #define STAR_MENU_RUN2 BUTTON_RIGHT | ||
86 | #define STAR_MENU_RUN3 BUTTON_ON | ||
87 | 81 | ||
88 | #elif CONFIG_KEYPAD == ONDIO_PAD | 82 | #elif CONFIG_KEYPAD == ONDIO_PAD |
89 | #define STAR_QUIT BUTTON_OFF | 83 | #define STAR_QUIT BUTTON_OFF |
@@ -96,7 +90,6 @@ PLUGIN_HEADER | |||
96 | #define STAR_LEVEL_UP (BUTTON_MENU | BUTTON_RIGHT) | 90 | #define STAR_LEVEL_UP (BUTTON_MENU | BUTTON_RIGHT) |
97 | #define STAR_LEVEL_DOWN (BUTTON_MENU | BUTTON_LEFT) | 91 | #define STAR_LEVEL_DOWN (BUTTON_MENU | BUTTON_LEFT) |
98 | #define STAR_LEVEL_REPEAT (BUTTON_MENU | BUTTON_UP) | 92 | #define STAR_LEVEL_REPEAT (BUTTON_MENU | BUTTON_UP) |
99 | #define STAR_MENU_RUN BUTTON_RIGHT | ||
100 | 93 | ||
101 | #elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || \ | 94 | #elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || \ |
102 | (CONFIG_KEYPAD == IRIVER_H300_PAD) | 95 | (CONFIG_KEYPAD == IRIVER_H300_PAD) |
@@ -110,8 +103,6 @@ PLUGIN_HEADER | |||
110 | #define STAR_LEVEL_UP (BUTTON_ON | BUTTON_RIGHT) | 103 | #define STAR_LEVEL_UP (BUTTON_ON | BUTTON_RIGHT) |
111 | #define STAR_LEVEL_DOWN (BUTTON_ON | BUTTON_LEFT) | 104 | #define STAR_LEVEL_DOWN (BUTTON_ON | BUTTON_LEFT) |
112 | #define STAR_LEVEL_REPEAT (BUTTON_ON | BUTTON_SELECT) | 105 | #define STAR_LEVEL_REPEAT (BUTTON_ON | BUTTON_SELECT) |
113 | #define STAR_MENU_RUN BUTTON_RIGHT | ||
114 | #define STAR_MENU_RUN2 BUTTON_SELECT | ||
115 | 106 | ||
116 | #define STAR_RC_QUIT BUTTON_RC_STOP | 107 | #define STAR_RC_QUIT BUTTON_RC_STOP |
117 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ | 108 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ |
@@ -128,8 +119,6 @@ PLUGIN_HEADER | |||
128 | #define STAR_LEVEL_UP (BUTTON_SELECT | BUTTON_RIGHT) | 119 | #define STAR_LEVEL_UP (BUTTON_SELECT | BUTTON_RIGHT) |
129 | #define STAR_LEVEL_DOWN (BUTTON_SELECT | BUTTON_LEFT) | 120 | #define STAR_LEVEL_DOWN (BUTTON_SELECT | BUTTON_LEFT) |
130 | #define STAR_LEVEL_REPEAT (BUTTON_SELECT | BUTTON_PLAY) | 121 | #define STAR_LEVEL_REPEAT (BUTTON_SELECT | BUTTON_PLAY) |
131 | #define STAR_MENU_RUN BUTTON_RIGHT | ||
132 | #define STAR_MENU_RUN2 BUTTON_SELECT | ||
133 | 122 | ||
134 | #elif (CONFIG_KEYPAD == IAUDIO_X5M5_PAD) | 123 | #elif (CONFIG_KEYPAD == IAUDIO_X5M5_PAD) |
135 | 124 | ||
@@ -144,8 +133,6 @@ PLUGIN_HEADER | |||
144 | #define STAR_LEVEL_DOWN_PRE BUTTON_REC | 133 | #define STAR_LEVEL_DOWN_PRE BUTTON_REC |
145 | #define STAR_LEVEL_DOWN (BUTTON_REC|BUTTON_REPEAT) | 134 | #define STAR_LEVEL_DOWN (BUTTON_REC|BUTTON_REPEAT) |
146 | #define STAR_LEVEL_REPEAT BUTTON_PLAY | 135 | #define STAR_LEVEL_REPEAT BUTTON_PLAY |
147 | #define STAR_MENU_RUN BUTTON_RIGHT | ||
148 | #define STAR_MENU_RUN2 BUTTON_SELECT | ||
149 | 136 | ||
150 | #elif (CONFIG_KEYPAD == GIGABEAT_PAD) | 137 | #elif (CONFIG_KEYPAD == GIGABEAT_PAD) |
151 | 138 | ||
@@ -158,8 +145,6 @@ PLUGIN_HEADER | |||
158 | #define STAR_LEVEL_UP BUTTON_VOL_UP | 145 | #define STAR_LEVEL_UP BUTTON_VOL_UP |
159 | #define STAR_LEVEL_DOWN BUTTON_VOL_DOWN | 146 | #define STAR_LEVEL_DOWN BUTTON_VOL_DOWN |
160 | #define STAR_LEVEL_REPEAT BUTTON_A | 147 | #define STAR_LEVEL_REPEAT BUTTON_A |
161 | #define STAR_MENU_RUN BUTTON_SELECT | ||
162 | |||
163 | 148 | ||
164 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ | 149 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ |
165 | (CONFIG_KEYPAD == SANSA_C200_PAD) || \ | 150 | (CONFIG_KEYPAD == SANSA_C200_PAD) || \ |
@@ -175,7 +160,6 @@ PLUGIN_HEADER | |||
175 | #define STAR_LEVEL_UP (BUTTON_SELECT | BUTTON_RIGHT) | 160 | #define STAR_LEVEL_UP (BUTTON_SELECT | BUTTON_RIGHT) |
176 | #define STAR_LEVEL_DOWN (BUTTON_SELECT | BUTTON_LEFT) | 161 | #define STAR_LEVEL_DOWN (BUTTON_SELECT | BUTTON_LEFT) |
177 | #define STAR_LEVEL_REPEAT (BUTTON_SELECT | BUTTON_DOWN) | 162 | #define STAR_LEVEL_REPEAT (BUTTON_SELECT | BUTTON_DOWN) |
178 | #define STAR_MENU_RUN BUTTON_SELECT | ||
179 | 163 | ||
180 | 164 | ||
181 | #elif (CONFIG_KEYPAD == SANSA_FUZE_PAD) | 165 | #elif (CONFIG_KEYPAD == SANSA_FUZE_PAD) |
@@ -189,8 +173,6 @@ PLUGIN_HEADER | |||
189 | #define STAR_LEVEL_UP (BUTTON_SELECT | BUTTON_RIGHT) | 173 | #define STAR_LEVEL_UP (BUTTON_SELECT | BUTTON_RIGHT) |
190 | #define STAR_LEVEL_DOWN (BUTTON_SELECT | BUTTON_LEFT) | 174 | #define STAR_LEVEL_DOWN (BUTTON_SELECT | BUTTON_LEFT) |
191 | #define STAR_LEVEL_REPEAT (BUTTON_SELECT | BUTTON_DOWN) | 175 | #define STAR_LEVEL_REPEAT (BUTTON_SELECT | BUTTON_DOWN) |
192 | #define STAR_MENU_RUN BUTTON_SELECT | ||
193 | |||
194 | 176 | ||
195 | #elif (CONFIG_KEYPAD == IRIVER_H10_PAD) | 177 | #elif (CONFIG_KEYPAD == IRIVER_H10_PAD) |
196 | 178 | ||
@@ -203,7 +185,6 @@ PLUGIN_HEADER | |||
203 | #define STAR_LEVEL_UP (BUTTON_PLAY | BUTTON_SCROLL_UP) | 185 | #define STAR_LEVEL_UP (BUTTON_PLAY | BUTTON_SCROLL_UP) |
204 | #define STAR_LEVEL_DOWN (BUTTON_PLAY | BUTTON_SCROLL_DOWN) | 186 | #define STAR_LEVEL_DOWN (BUTTON_PLAY | BUTTON_SCROLL_DOWN) |
205 | #define STAR_LEVEL_REPEAT (BUTTON_PLAY | BUTTON_RIGHT) | 187 | #define STAR_LEVEL_REPEAT (BUTTON_PLAY | BUTTON_RIGHT) |
206 | #define STAR_MENU_RUN BUTTON_FF | ||
207 | 188 | ||
208 | #elif (CONFIG_KEYPAD == GIGABEAT_S_PAD) | 189 | #elif (CONFIG_KEYPAD == GIGABEAT_S_PAD) |
209 | 190 | ||
@@ -216,7 +197,6 @@ PLUGIN_HEADER | |||
216 | #define STAR_LEVEL_UP BUTTON_VOL_UP | 197 | #define STAR_LEVEL_UP BUTTON_VOL_UP |
217 | #define STAR_LEVEL_DOWN BUTTON_VOL_DOWN | 198 | #define STAR_LEVEL_DOWN BUTTON_VOL_DOWN |
218 | #define STAR_LEVEL_REPEAT BUTTON_MENU | 199 | #define STAR_LEVEL_REPEAT BUTTON_MENU |
219 | #define STAR_MENU_RUN BUTTON_SELECT | ||
220 | 200 | ||
221 | #elif (CONFIG_KEYPAD == MROBE100_PAD) | 201 | #elif (CONFIG_KEYPAD == MROBE100_PAD) |
222 | 202 | ||
@@ -229,7 +209,6 @@ PLUGIN_HEADER | |||
229 | #define STAR_LEVEL_UP BUTTON_PLAY | 209 | #define STAR_LEVEL_UP BUTTON_PLAY |
230 | #define STAR_LEVEL_DOWN BUTTON_MENU | 210 | #define STAR_LEVEL_DOWN BUTTON_MENU |
231 | #define STAR_LEVEL_REPEAT BUTTON_DISPLAY | 211 | #define STAR_LEVEL_REPEAT BUTTON_DISPLAY |
232 | #define STAR_MENU_RUN BUTTON_SELECT | ||
233 | 212 | ||
234 | #elif CONFIG_KEYPAD == IAUDIO_M3_PAD | 213 | #elif CONFIG_KEYPAD == IAUDIO_M3_PAD |
235 | 214 | ||
@@ -242,13 +221,11 @@ PLUGIN_HEADER | |||
242 | #define STAR_LEVEL_UP (BUTTON_RC_PLAY|BUTTON_RC_VOL_UP) | 221 | #define STAR_LEVEL_UP (BUTTON_RC_PLAY|BUTTON_RC_VOL_UP) |
243 | #define STAR_LEVEL_DOWN (BUTTON_RC_PLAY|BUTTON_RC_VOL_DOWN) | 222 | #define STAR_LEVEL_DOWN (BUTTON_RC_PLAY|BUTTON_RC_VOL_DOWN) |
244 | #define STAR_LEVEL_REPEAT (BUTTON_RC_PLAY|BUTTON_RC_MENU) | 223 | #define STAR_LEVEL_REPEAT (BUTTON_RC_PLAY|BUTTON_RC_MENU) |
245 | #define STAR_MENU_RUN BUTTON_RC_FF | ||
246 | 224 | ||
247 | #elif (CONFIG_KEYPAD == COWOND2_PAD) | 225 | #elif (CONFIG_KEYPAD == COWOND2_PAD) |
248 | 226 | ||
249 | #define STAR_QUIT BUTTON_POWER | 227 | #define STAR_QUIT BUTTON_POWER |
250 | #define STAR_QUIT_NAME "[POWER]" | 228 | #define STAR_QUIT_NAME "[POWER]" |
251 | #define STAR_MENU_RUN BUTTON_MENU | ||
252 | 229 | ||
253 | #elif CONFIG_KEYPAD == CREATIVEZVM_PAD | 230 | #elif CONFIG_KEYPAD == CREATIVEZVM_PAD |
254 | 231 | ||
@@ -261,7 +238,6 @@ PLUGIN_HEADER | |||
261 | #define STAR_LEVEL_UP (BUTTON_CUSTOM | BUTTON_UP) | 238 | #define STAR_LEVEL_UP (BUTTON_CUSTOM | BUTTON_UP) |
262 | #define STAR_LEVEL_DOWN (BUTTON_CUSTOM | BUTTON_DOWN) | 239 | #define STAR_LEVEL_DOWN (BUTTON_CUSTOM | BUTTON_DOWN) |
263 | #define STAR_LEVEL_REPEAT (BUTTON_CUSTOM | BUTTON_RIGHT) | 240 | #define STAR_LEVEL_REPEAT (BUTTON_CUSTOM | BUTTON_RIGHT) |
264 | #define STAR_MENU_RUN BUTTON_MENU | ||
265 | 241 | ||
266 | #elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD | 242 | #elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD |
267 | 243 | ||
@@ -274,13 +250,11 @@ PLUGIN_HEADER | |||
274 | #define STAR_LEVEL_UP BUTTON_VOL_UP | 250 | #define STAR_LEVEL_UP BUTTON_VOL_UP |
275 | #define STAR_LEVEL_DOWN BUTTON_VOL_DOWN | 251 | #define STAR_LEVEL_DOWN BUTTON_VOL_DOWN |
276 | #define STAR_LEVEL_REPEAT BUTTON_VIEW | 252 | #define STAR_LEVEL_REPEAT BUTTON_VIEW |
277 | #define STAR_MENU_RUN BUTTON_MENU | ||
278 | 253 | ||
279 | #elif (CONFIG_KEYPAD == ONDAVX747_PAD) | 254 | #elif (CONFIG_KEYPAD == ONDAVX747_PAD) |
280 | 255 | ||
281 | #define STAR_QUIT BUTTON_POWER | 256 | #define STAR_QUIT BUTTON_POWER |
282 | #define STAR_QUIT_NAME "[POWER]" | 257 | #define STAR_QUIT_NAME "[POWER]" |
283 | #define STAR_MENU_RUN BUTTON_MENU | ||
284 | 258 | ||
285 | #elif CONFIG_KEYPAD == MROBE500_PAD | 259 | #elif CONFIG_KEYPAD == MROBE500_PAD |
286 | #define STAR_QUIT BUTTON_POWER | 260 | #define STAR_QUIT BUTTON_POWER |
@@ -295,9 +269,6 @@ PLUGIN_HEADER | |||
295 | //#define STAR_QUIT BUTTON_TOPLEFT | 269 | //#define STAR_QUIT BUTTON_TOPLEFT |
296 | //#define STAR_QUIT_NAME "[TOPLEFT]" | 270 | //#define STAR_QUIT_NAME "[TOPLEFT]" |
297 | //#endif | 271 | //#endif |
298 | #ifndef STAR_MENU_RUN | ||
299 | #define STAR_MENU_RUN BUTTON_TOPRIGHT | ||
300 | #endif | ||
301 | #ifndef STAR_LEFT | 272 | #ifndef STAR_LEFT |
302 | #define STAR_LEFT BUTTON_MIDLEFT | 273 | #define STAR_LEFT BUTTON_MIDLEFT |
303 | #endif | 274 | #endif |
@@ -1035,26 +1006,15 @@ static int star_menu(void) | |||
1035 | { | 1006 | { |
1036 | int selection, level=1; | 1007 | int selection, level=1; |
1037 | bool menu_quit = false; | 1008 | bool menu_quit = false; |
1038 | struct viewport vp[NB_SCREENS]; | ||
1039 | /* get the size of char */ | 1009 | /* get the size of char */ |
1040 | rb->lcd_getstringsize("a", &char_width, &char_height); | 1010 | rb->lcd_getstringsize("a", &char_width, &char_height); |
1041 | 1011 | ||
1042 | MENUITEM_STRINGLIST(menu,"Star Menu",NULL,"Play","Choose Level", | 1012 | MENUITEM_STRINGLIST(menu,"Star Menu",NULL,"Play","Choose Level", |
1043 | "Information","Keys","Quit"); | 1013 | "Information","Keys","Quit"); |
1044 | FOR_NB_SCREENS(selection) | 1014 | |
1045 | { | ||
1046 | rb->viewport_set_defaults(&vp[selection], selection); | ||
1047 | #if LCD_DEPTH > 1 | ||
1048 | if (rb->screens[selection]->depth > 1) | ||
1049 | { | ||
1050 | vp->bg_pattern = LCD_BLACK; | ||
1051 | vp->fg_pattern = LCD_WHITE; | ||
1052 | } | ||
1053 | #endif | ||
1054 | } | ||
1055 | while(!menu_quit) | 1015 | while(!menu_quit) |
1056 | { | 1016 | { |
1057 | switch(rb->do_menu(&menu, &selection, vp, false)) | 1017 | switch(rb->do_menu(&menu, &selection, NULL, false)) |
1058 | { | 1018 | { |
1059 | case 0: | 1019 | case 0: |
1060 | menu_quit = true; | 1020 | menu_quit = true; |