diff options
Diffstat (limited to 'apps/plugins/star.c')
-rw-r--r-- | apps/plugins/star.c | 41 |
1 files changed, 38 insertions, 3 deletions
diff --git a/apps/plugins/star.c b/apps/plugins/star.c index 56fe89c4d3..04b6642ede 100644 --- a/apps/plugins/star.c +++ b/apps/plugins/star.c | |||
@@ -55,6 +55,8 @@ PLUGIN_HEADER | |||
55 | /* variable button definitions */ | 55 | /* variable button definitions */ |
56 | #if CONFIG_KEYPAD == RECORDER_PAD | 56 | #if CONFIG_KEYPAD == RECORDER_PAD |
57 | #define STAR_QUIT BUTTON_OFF | 57 | #define STAR_QUIT BUTTON_OFF |
58 | #define STAR_LEFT BUTTON_LEFT | ||
59 | #define STAR_RIGHT BUTTON_RIGHT | ||
58 | #define STAR_UP BUTTON_UP | 60 | #define STAR_UP BUTTON_UP |
59 | #define STAR_DOWN BUTTON_DOWN | 61 | #define STAR_DOWN BUTTON_DOWN |
60 | #define STAR_TOGGLE_CONTROL BUTTON_ON | 62 | #define STAR_TOGGLE_CONTROL BUTTON_ON |
@@ -68,6 +70,8 @@ PLUGIN_HEADER | |||
68 | 70 | ||
69 | #elif CONFIG_KEYPAD == ARCHOS_AV300_PAD | 71 | #elif CONFIG_KEYPAD == ARCHOS_AV300_PAD |
70 | #define STAR_QUIT BUTTON_OFF | 72 | #define STAR_QUIT BUTTON_OFF |
73 | #define STAR_LEFT BUTTON_LEFT | ||
74 | #define STAR_RIGHT BUTTON_RIGHT | ||
71 | #define STAR_UP BUTTON_UP | 75 | #define STAR_UP BUTTON_UP |
72 | #define STAR_DOWN BUTTON_DOWN | 76 | #define STAR_DOWN BUTTON_DOWN |
73 | #define STAR_TOGGLE_CONTROL BUTTON_ON | 77 | #define STAR_TOGGLE_CONTROL BUTTON_ON |
@@ -81,6 +85,8 @@ PLUGIN_HEADER | |||
81 | 85 | ||
82 | #elif CONFIG_KEYPAD == ONDIO_PAD | 86 | #elif CONFIG_KEYPAD == ONDIO_PAD |
83 | #define STAR_QUIT BUTTON_OFF | 87 | #define STAR_QUIT BUTTON_OFF |
88 | #define STAR_LEFT BUTTON_LEFT | ||
89 | #define STAR_RIGHT BUTTON_RIGHT | ||
84 | #define STAR_UP BUTTON_UP | 90 | #define STAR_UP BUTTON_UP |
85 | #define STAR_DOWN BUTTON_DOWN | 91 | #define STAR_DOWN BUTTON_DOWN |
86 | #define STAR_TOGGLE_CONTROL_PRE BUTTON_MENU | 92 | #define STAR_TOGGLE_CONTROL_PRE BUTTON_MENU |
@@ -93,6 +99,8 @@ PLUGIN_HEADER | |||
93 | #elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || \ | 99 | #elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || \ |
94 | (CONFIG_KEYPAD == IRIVER_H300_PAD) | 100 | (CONFIG_KEYPAD == IRIVER_H300_PAD) |
95 | #define STAR_QUIT BUTTON_OFF | 101 | #define STAR_QUIT BUTTON_OFF |
102 | #define STAR_LEFT BUTTON_LEFT | ||
103 | #define STAR_RIGHT BUTTON_RIGHT | ||
96 | #define STAR_UP BUTTON_UP | 104 | #define STAR_UP BUTTON_UP |
97 | #define STAR_DOWN BUTTON_DOWN | 105 | #define STAR_DOWN BUTTON_DOWN |
98 | #define STAR_TOGGLE_CONTROL BUTTON_MODE | 106 | #define STAR_TOGGLE_CONTROL BUTTON_MODE |
@@ -109,6 +117,8 @@ PLUGIN_HEADER | |||
109 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) | 117 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) |
110 | 118 | ||
111 | #define STAR_QUIT (BUTTON_SELECT | BUTTON_MENU) | 119 | #define STAR_QUIT (BUTTON_SELECT | BUTTON_MENU) |
120 | #define STAR_LEFT BUTTON_LEFT | ||
121 | #define STAR_RIGHT BUTTON_RIGHT | ||
112 | #define STAR_UP BUTTON_MENU | 122 | #define STAR_UP BUTTON_MENU |
113 | #define STAR_DOWN BUTTON_PLAY | 123 | #define STAR_DOWN BUTTON_PLAY |
114 | #define STAR_TOGGLE_CONTROL_PRE BUTTON_SELECT | 124 | #define STAR_TOGGLE_CONTROL_PRE BUTTON_SELECT |
@@ -122,6 +132,8 @@ PLUGIN_HEADER | |||
122 | #elif (CONFIG_KEYPAD == IAUDIO_X5M5_PAD) | 132 | #elif (CONFIG_KEYPAD == IAUDIO_X5M5_PAD) |
123 | 133 | ||
124 | #define STAR_QUIT BUTTON_POWER | 134 | #define STAR_QUIT BUTTON_POWER |
135 | #define STAR_LEFT BUTTON_LEFT | ||
136 | #define STAR_RIGHT BUTTON_RIGHT | ||
125 | #define STAR_UP BUTTON_UP | 137 | #define STAR_UP BUTTON_UP |
126 | #define STAR_DOWN BUTTON_DOWN | 138 | #define STAR_DOWN BUTTON_DOWN |
127 | #define STAR_TOGGLE_CONTROL BUTTON_SELECT | 139 | #define STAR_TOGGLE_CONTROL BUTTON_SELECT |
@@ -136,6 +148,8 @@ PLUGIN_HEADER | |||
136 | #elif (CONFIG_KEYPAD == GIGABEAT_PAD) | 148 | #elif (CONFIG_KEYPAD == GIGABEAT_PAD) |
137 | 149 | ||
138 | #define STAR_QUIT BUTTON_POWER | 150 | #define STAR_QUIT BUTTON_POWER |
151 | #define STAR_LEFT BUTTON_LEFT | ||
152 | #define STAR_RIGHT BUTTON_RIGHT | ||
139 | #define STAR_UP BUTTON_UP | 153 | #define STAR_UP BUTTON_UP |
140 | #define STAR_DOWN BUTTON_DOWN | 154 | #define STAR_DOWN BUTTON_DOWN |
141 | #define STAR_TOGGLE_CONTROL BUTTON_SELECT | 155 | #define STAR_TOGGLE_CONTROL BUTTON_SELECT |
@@ -148,6 +162,8 @@ PLUGIN_HEADER | |||
148 | (CONFIG_KEYPAD == SANSA_C200_PAD) | 162 | (CONFIG_KEYPAD == SANSA_C200_PAD) |
149 | 163 | ||
150 | #define STAR_QUIT BUTTON_POWER | 164 | #define STAR_QUIT BUTTON_POWER |
165 | #define STAR_LEFT BUTTON_LEFT | ||
166 | #define STAR_RIGHT BUTTON_RIGHT | ||
151 | #define STAR_UP BUTTON_UP | 167 | #define STAR_UP BUTTON_UP |
152 | #define STAR_DOWN BUTTON_DOWN | 168 | #define STAR_DOWN BUTTON_DOWN |
153 | #define STAR_TOGGLE_CONTROL BUTTON_SELECT | 169 | #define STAR_TOGGLE_CONTROL BUTTON_SELECT |
@@ -160,6 +176,8 @@ PLUGIN_HEADER | |||
160 | #elif (CONFIG_KEYPAD == IRIVER_H10_PAD) | 176 | #elif (CONFIG_KEYPAD == IRIVER_H10_PAD) |
161 | 177 | ||
162 | #define STAR_QUIT BUTTON_POWER | 178 | #define STAR_QUIT BUTTON_POWER |
179 | #define STAR_LEFT BUTTON_LEFT | ||
180 | #define STAR_RIGHT BUTTON_RIGHT | ||
163 | #define STAR_UP BUTTON_SCROLL_UP | 181 | #define STAR_UP BUTTON_SCROLL_UP |
164 | #define STAR_DOWN BUTTON_SCROLL_DOWN | 182 | #define STAR_DOWN BUTTON_SCROLL_DOWN |
165 | #define STAR_TOGGLE_CONTROL BUTTON_REW | 183 | #define STAR_TOGGLE_CONTROL BUTTON_REW |
@@ -171,6 +189,8 @@ PLUGIN_HEADER | |||
171 | #elif (CONFIG_KEYPAD == GIGABEAT_S_PAD) | 189 | #elif (CONFIG_KEYPAD == GIGABEAT_S_PAD) |
172 | 190 | ||
173 | #define STAR_QUIT BUTTON_BACK | 191 | #define STAR_QUIT BUTTON_BACK |
192 | #define STAR_LEFT BUTTON_LEFT | ||
193 | #define STAR_RIGHT BUTTON_RIGHT | ||
174 | #define STAR_UP BUTTON_UP | 194 | #define STAR_UP BUTTON_UP |
175 | #define STAR_DOWN BUTTON_DOWN | 195 | #define STAR_DOWN BUTTON_DOWN |
176 | #define STAR_TOGGLE_CONTROL BUTTON_SELECT | 196 | #define STAR_TOGGLE_CONTROL BUTTON_SELECT |
@@ -182,6 +202,8 @@ PLUGIN_HEADER | |||
182 | #elif (CONFIG_KEYPAD == MROBE100_PAD) | 202 | #elif (CONFIG_KEYPAD == MROBE100_PAD) |
183 | 203 | ||
184 | #define STAR_QUIT BUTTON_POWER | 204 | #define STAR_QUIT BUTTON_POWER |
205 | #define STAR_LEFT BUTTON_LEFT | ||
206 | #define STAR_RIGHT BUTTON_RIGHT | ||
185 | #define STAR_UP BUTTON_UP | 207 | #define STAR_UP BUTTON_UP |
186 | #define STAR_DOWN BUTTON_DOWN | 208 | #define STAR_DOWN BUTTON_DOWN |
187 | #define STAR_TOGGLE_CONTROL BUTTON_SELECT | 209 | #define STAR_TOGGLE_CONTROL BUTTON_SELECT |
@@ -190,6 +212,19 @@ PLUGIN_HEADER | |||
190 | #define STAR_LEVEL_REPEAT BUTTON_DISPLAY | 212 | #define STAR_LEVEL_REPEAT BUTTON_DISPLAY |
191 | #define STAR_MENU_RUN BUTTON_SELECT | 213 | #define STAR_MENU_RUN BUTTON_SELECT |
192 | 214 | ||
215 | #elif CONFIG_KEYPAD == IAUDIO_M3_PAD | ||
216 | |||
217 | #define STAR_QUIT BUTTON_RC_REC | ||
218 | #define STAR_LEFT BUTTON_RC_REW | ||
219 | #define STAR_RIGHT BUTTON_RC_FF | ||
220 | #define STAR_UP BUTTON_RC_VOL_UP | ||
221 | #define STAR_DOWN BUTTON_RC_VOL_DOWN | ||
222 | #define STAR_TOGGLE_CONTROL BUTTON_RC_MODE | ||
223 | #define STAR_LEVEL_UP (BUTTON_RC_PLAY|BUTTON_RC_VOL_UP) | ||
224 | #define STAR_LEVEL_DOWN (BUTTON_RC_PLAY|BUTTON_RC_VOL_DOWN) | ||
225 | #define STAR_LEVEL_REPEAT (BUTTON_RC_PLAY|BUTTON_RC_MENU) | ||
226 | #define STAR_MENU_RUN BUTTON_RC_FF | ||
227 | |||
193 | #else | 228 | #else |
194 | #error No keymap defined! | 229 | #error No keymap defined! |
195 | #endif | 230 | #endif |
@@ -514,7 +549,7 @@ void star_display_text(char *str, bool waitkey) | |||
514 | switch (key) | 549 | switch (key) |
515 | { | 550 | { |
516 | case STAR_QUIT: | 551 | case STAR_QUIT: |
517 | case BUTTON_LEFT: | 552 | case STAR_LEFT: |
518 | case STAR_DOWN: | 553 | case STAR_DOWN: |
519 | go_on = true; | 554 | go_on = true; |
520 | break; | 555 | break; |
@@ -769,11 +804,11 @@ static int star_run_game(int current_level) | |||
769 | case STAR_QUIT: | 804 | case STAR_QUIT: |
770 | return -1; | 805 | return -1; |
771 | 806 | ||
772 | case BUTTON_LEFT: | 807 | case STAR_LEFT: |
773 | move_x = -1; | 808 | move_x = -1; |
774 | break; | 809 | break; |
775 | 810 | ||
776 | case BUTTON_RIGHT: | 811 | case STAR_RIGHT: |
777 | move_x = 1; | 812 | move_x = 1; |
778 | break; | 813 | break; |
779 | 814 | ||