diff options
Diffstat (limited to 'apps/plugins')
-rw-r--r-- | apps/plugins/blackjack.c | 10 | ||||
-rw-r--r-- | apps/plugins/bubbles.c | 7 | ||||
-rw-r--r-- | apps/plugins/vu_meter.c | 72 |
3 files changed, 74 insertions, 15 deletions
diff --git a/apps/plugins/blackjack.c b/apps/plugins/blackjack.c index f69ca1e6b0..c9814abf89 100644 --- a/apps/plugins/blackjack.c +++ b/apps/plugins/blackjack.c | |||
@@ -1184,6 +1184,16 @@ static unsigned int blackjack_menu(struct game_context* bj) { | |||
1184 | rb->lcd_puts(0, 7, "REC to view scores"); | 1184 | rb->lcd_puts(0, 7, "REC to view scores"); |
1185 | rb->snprintf(str, 21, "High Score: $%d", bj->highscores[0]); | 1185 | rb->snprintf(str, 21, "High Score: $%d", bj->highscores[0]); |
1186 | rb->lcd_puts(0, 9, str); | 1186 | rb->lcd_puts(0, 9, str); |
1187 | #elif CONFIG_KEYPAD == IAUDIO_M3_PAD | ||
1188 | rb->lcd_puts(0, 2, "PLAY to start & to"); | ||
1189 | rb->lcd_puts(0, 3, " hit"); | ||
1190 | rb->lcd_puts(0, 4, "REC to exit"); | ||
1191 | rb->lcd_puts(0, 5, "FF to stay"); | ||
1192 | rb->lcd_puts(0, 6, "REW to double down"); | ||
1193 | rb->lcd_puts(0, 7, "MODE to save/resume"); | ||
1194 | rb->lcd_puts(0, 8, "MENU to view scores"); | ||
1195 | rb->snprintf(str, 21, "High Score: $%d", bj->highscores[0]); | ||
1196 | rb->lcd_puts(0, 10, str); | ||
1187 | #endif | 1197 | #endif |
1188 | } else { | 1198 | } else { |
1189 | rb->snprintf(str, 12, "%s", "High Scores"); | 1199 | rb->snprintf(str, 12, "%s", "High Scores"); |
diff --git a/apps/plugins/bubbles.c b/apps/plugins/bubbles.c index 85cde59188..354f4fa67c 100644 --- a/apps/plugins/bubbles.c +++ b/apps/plugins/bubbles.c | |||
@@ -2284,8 +2284,9 @@ static int bubbles_handlebuttons(struct game_context* bb, bool animblock, | |||
2284 | if (timeout < 0) | 2284 | if (timeout < 0) |
2285 | timeout = 0; | 2285 | timeout = 0; |
2286 | button = pluginlib_getaction(rb,timeout,plugin_contexts,2); | 2286 | button = pluginlib_getaction(rb,timeout,plugin_contexts,2); |
2287 | #ifdef HAS_BUTTON_HOLD | 2287 | #ifdef HAS_BUTTON_HOLD && !defined(HAVE_REMOTE_LCD_AS_MAIN) |
2288 | if (rb->button_hold()) | 2288 | /* FIXME: Should probably check remote hold here */ |
2289 | if (rb->button_hold()) | ||
2289 | button = BUBBLES_START; | 2290 | button = BUBBLES_START; |
2290 | #endif | 2291 | #endif |
2291 | 2292 | ||
@@ -2455,7 +2456,7 @@ static int bubbles(struct game_context* bb) { | |||
2455 | rb->lcd_puts(0, 5, "MODE to fire"); | 2456 | rb->lcd_puts(0, 5, "MODE to fire"); |
2456 | rb->lcd_puts(0, 6, " and show high scores"); | 2457 | rb->lcd_puts(0, 6, " and show high scores"); |
2457 | rb->lcd_puts(0, 7, "REW/FF to aim"); | 2458 | rb->lcd_puts(0, 7, "REW/FF to aim"); |
2458 | rb->lcd_puts(0, 8, "VOL UP/DN to change level"); | 2459 | rb->lcd_puts(0, 8, "VOL UP/DN to chg. lvl"); |
2459 | #endif | 2460 | #endif |
2460 | #if LCD_WIDTH >= 138 | 2461 | #if LCD_WIDTH >= 138 |
2461 | rb->snprintf(str, 28, "Start on level %d of %d", startlevel+1, | 2462 | rb->snprintf(str, 28, "Start on level %d of %d", startlevel+1, |
diff --git a/apps/plugins/vu_meter.c b/apps/plugins/vu_meter.c index 9773d92d9c..97ad12d419 100644 --- a/apps/plugins/vu_meter.c +++ b/apps/plugins/vu_meter.c | |||
@@ -31,6 +31,10 @@ PLUGIN_HEADER | |||
31 | #define VUMETER_MENU_EXIT2 BUTTON_OFF | 31 | #define VUMETER_MENU_EXIT2 BUTTON_OFF |
32 | #define VUMETER_UP BUTTON_UP | 32 | #define VUMETER_UP BUTTON_UP |
33 | #define VUMETER_DOWN BUTTON_DOWN | 33 | #define VUMETER_DOWN BUTTON_DOWN |
34 | #define LABEL_HELP "ON" | ||
35 | #define LABEL_QUIT "OFF" | ||
36 | #define LABEL_MENU "F1" | ||
37 | #define LABEL_VOLUME "UP/DOWN" | ||
34 | 38 | ||
35 | #elif CONFIG_KEYPAD == ARCHOS_AV300_PAD | 39 | #elif CONFIG_KEYPAD == ARCHOS_AV300_PAD |
36 | #define VUMETER_QUIT BUTTON_OFF | 40 | #define VUMETER_QUIT BUTTON_OFF |
@@ -40,6 +44,10 @@ PLUGIN_HEADER | |||
40 | #define VUMETER_MENU_EXIT2 BUTTON_OFF | 44 | #define VUMETER_MENU_EXIT2 BUTTON_OFF |
41 | #define VUMETER_UP BUTTON_UP | 45 | #define VUMETER_UP BUTTON_UP |
42 | #define VUMETER_DOWN BUTTON_DOWN | 46 | #define VUMETER_DOWN BUTTON_DOWN |
47 | #define LABEL_HELP "ON" | ||
48 | #define LABEL_QUIT "OFF" | ||
49 | #define LABEL_MENU "F1" | ||
50 | #define LABEL_VOLUME "UP/DOWN" | ||
43 | 51 | ||
44 | #elif CONFIG_KEYPAD == ONDIO_PAD | 52 | #elif CONFIG_KEYPAD == ONDIO_PAD |
45 | #define VUMETER_QUIT BUTTON_OFF | 53 | #define VUMETER_QUIT BUTTON_OFF |
@@ -51,6 +59,10 @@ PLUGIN_HEADER | |||
51 | #define VUMETER_MENU_EXIT2 BUTTON_OFF | 59 | #define VUMETER_MENU_EXIT2 BUTTON_OFF |
52 | #define VUMETER_UP BUTTON_UP | 60 | #define VUMETER_UP BUTTON_UP |
53 | #define VUMETER_DOWN BUTTON_DOWN | 61 | #define VUMETER_DOWN BUTTON_DOWN |
62 | #define LABEL_HELP "MODE" | ||
63 | #define LABEL_QUIT "OFF" | ||
64 | #define LABEL_MENU "MODE.." | ||
65 | #define LABEL_VOLUME "UP/DOWN" | ||
54 | 66 | ||
55 | #elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || \ | 67 | #elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || \ |
56 | (CONFIG_KEYPAD == IRIVER_H300_PAD) | 68 | (CONFIG_KEYPAD == IRIVER_H300_PAD) |
@@ -62,6 +74,10 @@ PLUGIN_HEADER | |||
62 | #define VUMETER_MENU_EXIT2 BUTTON_OFF | 74 | #define VUMETER_MENU_EXIT2 BUTTON_OFF |
63 | #define VUMETER_UP BUTTON_UP | 75 | #define VUMETER_UP BUTTON_UP |
64 | #define VUMETER_DOWN BUTTON_DOWN | 76 | #define VUMETER_DOWN BUTTON_DOWN |
77 | #define LABEL_HELP "PLAY" | ||
78 | #define LABEL_QUIT "STOP" | ||
79 | #define LABEL_MENU "SELECT,MODE" | ||
80 | #define LABEL_VOLUME "UP/DOWN" | ||
65 | 81 | ||
66 | #define VUMETER_RC_QUIT BUTTON_RC_STOP | 82 | #define VUMETER_RC_QUIT BUTTON_RC_STOP |
67 | 83 | ||
@@ -75,6 +91,10 @@ PLUGIN_HEADER | |||
75 | #define VUMETER_MENU_EXIT2 BUTTON_MENU | 91 | #define VUMETER_MENU_EXIT2 BUTTON_MENU |
76 | #define VUMETER_UP BUTTON_SCROLL_FWD | 92 | #define VUMETER_UP BUTTON_SCROLL_FWD |
77 | #define VUMETER_DOWN BUTTON_SCROLL_BACK | 93 | #define VUMETER_DOWN BUTTON_SCROLL_BACK |
94 | #define LABEL_HELP "PLAY" | ||
95 | #define LABEL_QUIT "MENU" | ||
96 | #define LABEL_MENU "SELECT" | ||
97 | #define LABEL_VOLUME "Wheel" | ||
78 | 98 | ||
79 | #elif (CONFIG_KEYPAD == GIGABEAT_PAD) | 99 | #elif (CONFIG_KEYPAD == GIGABEAT_PAD) |
80 | #define VUMETER_QUIT BUTTON_POWER | 100 | #define VUMETER_QUIT BUTTON_POWER |
@@ -84,6 +104,10 @@ PLUGIN_HEADER | |||
84 | #define VUMETER_MENU_EXIT2 BUTTON_POWER | 104 | #define VUMETER_MENU_EXIT2 BUTTON_POWER |
85 | #define VUMETER_UP BUTTON_UP | 105 | #define VUMETER_UP BUTTON_UP |
86 | #define VUMETER_DOWN BUTTON_DOWN | 106 | #define VUMETER_DOWN BUTTON_DOWN |
107 | #define LABEL_HELP "A" | ||
108 | #define LABEL_QUIT "POWER" | ||
109 | #define LABEL_MENU "MENU" | ||
110 | #define LABEL_VOLUME "UP/DOWN" | ||
87 | 111 | ||
88 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) | 112 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) |
89 | #define VUMETER_QUIT BUTTON_POWER | 113 | #define VUMETER_QUIT BUTTON_POWER |
@@ -93,6 +117,10 @@ PLUGIN_HEADER | |||
93 | #define VUMETER_MENU_EXIT2 BUTTON_POWER | 117 | #define VUMETER_MENU_EXIT2 BUTTON_POWER |
94 | #define VUMETER_UP BUTTON_SCROLL_FWD | 118 | #define VUMETER_UP BUTTON_SCROLL_FWD |
95 | #define VUMETER_DOWN BUTTON_SCROLL_BACK | 119 | #define VUMETER_DOWN BUTTON_SCROLL_BACK |
120 | #define LABEL_HELP "REC" | ||
121 | #define LABEL_QUIT "POWER" | ||
122 | #define LABEL_MENU "SELECT" | ||
123 | #define LABEL_VOLUME "Wheel" | ||
96 | 124 | ||
97 | #elif (CONFIG_KEYPAD == SANSA_C200_PAD) | 125 | #elif (CONFIG_KEYPAD == SANSA_C200_PAD) |
98 | #define VUMETER_QUIT BUTTON_POWER | 126 | #define VUMETER_QUIT BUTTON_POWER |
@@ -102,6 +130,10 @@ PLUGIN_HEADER | |||
102 | #define VUMETER_MENU_EXIT2 BUTTON_POWER | 130 | #define VUMETER_MENU_EXIT2 BUTTON_POWER |
103 | #define VUMETER_UP BUTTON_VOL_UP | 131 | #define VUMETER_UP BUTTON_VOL_UP |
104 | #define VUMETER_DOWN BUTTON_VOL_DOWN | 132 | #define VUMETER_DOWN BUTTON_VOL_DOWN |
133 | #define LABEL_HELP "REC" | ||
134 | #define LABEL_QUIT "POWER" | ||
135 | #define LABEL_MENU "SELECT" | ||
136 | #define LABEL_VOLUME "VOL UP/DN" | ||
105 | 137 | ||
106 | #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD | 138 | #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD |
107 | #define VUMETER_QUIT BUTTON_POWER | 139 | #define VUMETER_QUIT BUTTON_POWER |
@@ -111,6 +143,10 @@ PLUGIN_HEADER | |||
111 | #define VUMETER_MENU_EXIT2 BUTTON_POWER | 143 | #define VUMETER_MENU_EXIT2 BUTTON_POWER |
112 | #define VUMETER_UP BUTTON_UP | 144 | #define VUMETER_UP BUTTON_UP |
113 | #define VUMETER_DOWN BUTTON_DOWN | 145 | #define VUMETER_DOWN BUTTON_DOWN |
146 | #define LABEL_HELP "PLAY" | ||
147 | #define LABEL_QUIT "POWER" | ||
148 | #define LABEL_MENU "SELECT" | ||
149 | #define LABEL_VOLUME "UP/DOWN" | ||
114 | 150 | ||
115 | #elif CONFIG_KEYPAD == IRIVER_H10_PAD | 151 | #elif CONFIG_KEYPAD == IRIVER_H10_PAD |
116 | #define VUMETER_QUIT BUTTON_POWER | 152 | #define VUMETER_QUIT BUTTON_POWER |
@@ -120,6 +156,10 @@ PLUGIN_HEADER | |||
120 | #define VUMETER_MENU_EXIT2 BUTTON_POWER | 156 | #define VUMETER_MENU_EXIT2 BUTTON_POWER |
121 | #define VUMETER_UP BUTTON_SCROLL_UP | 157 | #define VUMETER_UP BUTTON_SCROLL_UP |
122 | #define VUMETER_DOWN BUTTON_SCROLL_DOWN | 158 | #define VUMETER_DOWN BUTTON_SCROLL_DOWN |
159 | #define LABEL_HELP "PLAY" | ||
160 | #define LABEL_QUIT "POWER" | ||
161 | #define LABEL_MENU "REW" | ||
162 | #define LABEL_VOLUME "Scroller" | ||
123 | 163 | ||
124 | #elif (CONFIG_KEYPAD == GIGABEAT_S_PAD) | 164 | #elif (CONFIG_KEYPAD == GIGABEAT_S_PAD) |
125 | #define VUMETER_QUIT BUTTON_BACK | 165 | #define VUMETER_QUIT BUTTON_BACK |
@@ -129,6 +169,10 @@ PLUGIN_HEADER | |||
129 | #define VUMETER_MENU_EXIT2 BUTTON_PLAY | 169 | #define VUMETER_MENU_EXIT2 BUTTON_PLAY |
130 | #define VUMETER_UP BUTTON_UP | 170 | #define VUMETER_UP BUTTON_UP |
131 | #define VUMETER_DOWN BUTTON_DOWN | 171 | #define VUMETER_DOWN BUTTON_DOWN |
172 | #define LABEL_HELP "NEXT" | ||
173 | #define LABEL_QUIT "BACK" | ||
174 | #define LABEL_MENU "MENU" | ||
175 | #define LABEL_VOLUME "UP/DOWN" | ||
132 | 176 | ||
133 | #elif (CONFIG_KEYPAD == MROBE100_PAD) | 177 | #elif (CONFIG_KEYPAD == MROBE100_PAD) |
134 | #define VUMETER_QUIT BUTTON_POWER | 178 | #define VUMETER_QUIT BUTTON_POWER |
@@ -138,6 +182,10 @@ PLUGIN_HEADER | |||
138 | #define VUMETER_MENU_EXIT2 BUTTON_POWER | 182 | #define VUMETER_MENU_EXIT2 BUTTON_POWER |
139 | #define VUMETER_UP BUTTON_UP | 183 | #define VUMETER_UP BUTTON_UP |
140 | #define VUMETER_DOWN BUTTON_DOWN | 184 | #define VUMETER_DOWN BUTTON_DOWN |
185 | #define LABEL_HELP "DISPLAY" | ||
186 | #define LABEL_QUIT "POWER" | ||
187 | #define LABEL_MENU "MENU" | ||
188 | #define LABEL_VOLUME "UP/DOWN" | ||
141 | 189 | ||
142 | #elif CONFIG_KEYPAD == IAUDIO_M3_PAD | 190 | #elif CONFIG_KEYPAD == IAUDIO_M3_PAD |
143 | #define VUMETER_QUIT BUTTON_RC_REC | 191 | #define VUMETER_QUIT BUTTON_RC_REC |
@@ -147,6 +195,10 @@ PLUGIN_HEADER | |||
147 | #define VUMETER_MENU_EXIT2 BUTTON_RC_REC | 195 | #define VUMETER_MENU_EXIT2 BUTTON_RC_REC |
148 | #define VUMETER_UP BUTTON_RC_VOL_UP | 196 | #define VUMETER_UP BUTTON_RC_VOL_UP |
149 | #define VUMETER_DOWN BUTTON_RC_VOL_DOWN | 197 | #define VUMETER_DOWN BUTTON_RC_VOL_DOWN |
198 | #define LABEL_HELP "MODE" | ||
199 | #define LABEL_QUIT "REC" | ||
200 | #define LABEL_MENU "MENU" | ||
201 | #define LABEL_VOLUME "VOL UP/DN" | ||
150 | 202 | ||
151 | #elif CONFIG_KEYPAD == COWOND2_PAD | 203 | #elif CONFIG_KEYPAD == COWOND2_PAD |
152 | #define VUMETER_QUIT BUTTON_POWER | 204 | #define VUMETER_QUIT BUTTON_POWER |
@@ -156,6 +208,10 @@ PLUGIN_HEADER | |||
156 | #define VUMETER_MENU_EXIT2 BUTTON_POWER | 208 | #define VUMETER_MENU_EXIT2 BUTTON_POWER |
157 | #define VUMETER_UP BUTTON_UP | 209 | #define VUMETER_UP BUTTON_UP |
158 | #define VUMETER_DOWN BUTTON_DOWN | 210 | #define VUMETER_DOWN BUTTON_DOWN |
211 | #define LABEL_HELP "SELECT" | ||
212 | #define LABEL_QUIT "POWER" | ||
213 | #define LABEL_MENU "MENU" | ||
214 | #define LABEL_VOLUME "UP/DOWN" | ||
159 | 215 | ||
160 | #else | 216 | #else |
161 | #error No keymap defined! | 217 | #error No keymap defined! |
@@ -290,11 +346,7 @@ void load_settings(void) { | |||
290 | } | 346 | } |
291 | else { | 347 | else { |
292 | reset_settings(); | 348 | reset_settings(); |
293 | #if CONFIG_KEYPAD == RECORDER_PAD | 349 | rb->splash(HZ, "Press " LABEL_HELP " for help"); |
294 | rb->splash(HZ, "Press ON for help"); | ||
295 | #elif CONFIG_KEYPAD == ONDIO_PAD | ||
296 | rb->splash(HZ, "Press MODE for help"); | ||
297 | #endif | ||
298 | } | 350 | } |
299 | } | 351 | } |
300 | 352 | ||
@@ -617,13 +669,9 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) { | |||
617 | break; | 669 | break; |
618 | #endif | 670 | #endif |
619 | rb->lcd_clear_display(); | 671 | rb->lcd_clear_display(); |
620 | rb->lcd_puts(0, 0, "OFF: Exit"); | 672 | rb->lcd_puts(0, 0, LABEL_QUIT ": Exit"); |
621 | #if CONFIG_KEYPAD == RECORDER_PAD | 673 | rb->lcd_puts(0, 1, LABEL_MENU ": Settings"); |
622 | rb->lcd_puts(0, 1, "F1: Settings"); | 674 | rb->lcd_puts(0, 2, LABEL_VOLUME ": Volume"); |
623 | #elif CONFIG_KEYPAD == ONDIO_PAD | ||
624 | rb->lcd_puts(0, 1, "MODE..: Settings"); | ||
625 | #endif | ||
626 | rb->lcd_puts(0, 2, "UP/DOWN: Volume"); | ||
627 | rb->lcd_update(); | 675 | rb->lcd_update(); |
628 | rb->sleep(HZ*3); | 676 | rb->sleep(HZ*3); |
629 | break; | 677 | break; |