diff options
author | Teruaki Kawashima <teru@rockbox.org> | 2009-12-05 12:47:53 +0000 |
---|---|---|
committer | Teruaki Kawashima <teru@rockbox.org> | 2009-12-05 12:47:53 +0000 |
commit | 237f129651875a5cba42ea5b405611406aa5a506 (patch) | |
tree | 643166af413c3a2701adba87659fd5d38f98932d | |
parent | f76b5d5490a3c4e4168d5a1912b7c3ceff59a50c (diff) | |
download | rockbox-237f129651875a5cba42ea5b405611406aa5a506.tar.gz rockbox-237f129651875a5cba42ea5b405611406aa5a506.zip |
plasma: clean up button definition.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23851 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/plugins/plasma.c | 104 |
1 files changed, 44 insertions, 60 deletions
diff --git a/apps/plugins/plasma.c b/apps/plugins/plasma.c index f93e08eaba..e17a147139 100644 --- a/apps/plugins/plasma.c +++ b/apps/plugins/plasma.c | |||
@@ -58,83 +58,102 @@ static bool boosted = false; | |||
58 | #endif | 58 | #endif |
59 | 59 | ||
60 | /* Key assignement, all bitmapped models */ | 60 | /* Key assignement, all bitmapped models */ |
61 | #if (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) || \ | 61 | #if (CONFIG_KEYPAD == RECORDER_PAD) || (CONFIG_KEYPAD == ONDIO_PAD) |
62 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) | 62 | #define PLASMA_QUIT BUTTON_OFF |
63 | #define PLASMA_QUIT BUTTON_MENU | 63 | #define PLASMA_INCREASE_FREQUENCY BUTTON_UP |
64 | #define PLASMA_DECREASE_FREQUENCY BUTTON_DOWN | ||
65 | |||
66 | #elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || (CONFIG_KEYPAD == IRIVER_H300_PAD) | ||
67 | #define PLASMA_QUIT BUTTON_OFF | ||
68 | #define PLASMA_INCREASE_FREQUENCY BUTTON_UP | ||
69 | #define PLASMA_DECREASE_FREQUENCY BUTTON_DOWN | ||
70 | #define PLASMA_REGEN_COLORS BUTTON_SELECT | ||
71 | #define PLASMA_RC_QUIT BUTTON_RC_STOP | ||
72 | |||
73 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) || \ | ||
74 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) | ||
75 | #define PLASMA_QUIT BUTTON_MENU | ||
64 | #define PLASMA_INCREASE_FREQUENCY BUTTON_SCROLL_FWD | 76 | #define PLASMA_INCREASE_FREQUENCY BUTTON_SCROLL_FWD |
65 | #define PLASMA_DECREASE_FREQUENCY BUTTON_SCROLL_BACK | 77 | #define PLASMA_DECREASE_FREQUENCY BUTTON_SCROLL_BACK |
78 | #define PLASMA_REGEN_COLORS BUTTON_SELECT | ||
66 | 79 | ||
67 | #elif (CONFIG_KEYPAD == GIGABEAT_PAD) | 80 | #elif (CONFIG_KEYPAD == GIGABEAT_PAD) |
68 | #define PLASMA_QUIT BUTTON_POWER | 81 | #define PLASMA_QUIT BUTTON_POWER |
69 | #define PLASMA_INCREASE_FREQUENCY BUTTON_UP | 82 | #define PLASMA_INCREASE_FREQUENCY BUTTON_UP |
70 | #define PLASMA_DECREASE_FREQUENCY BUTTON_DOWN | 83 | #define PLASMA_DECREASE_FREQUENCY BUTTON_DOWN |
84 | #define PLASMA_REGEN_COLORS BUTTON_SELECT | ||
71 | 85 | ||
72 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ | 86 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ |
73 | (CONFIG_KEYPAD == SANSA_C200_PAD) || \ | 87 | (CONFIG_KEYPAD == SANSA_C200_PAD) || \ |
74 | (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ | 88 | (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ |
75 | (CONFIG_KEYPAD == SANSA_M200_PAD) | 89 | (CONFIG_KEYPAD == SANSA_M200_PAD) |
76 | #define PLASMA_QUIT BUTTON_POWER | 90 | #define PLASMA_QUIT BUTTON_POWER |
77 | #define PLASMA_INCREASE_FREQUENCY BUTTON_UP | 91 | #define PLASMA_INCREASE_FREQUENCY BUTTON_UP |
78 | #define PLASMA_DECREASE_FREQUENCY BUTTON_DOWN | 92 | #define PLASMA_DECREASE_FREQUENCY BUTTON_DOWN |
93 | #define PLASMA_REGEN_COLORS BUTTON_SELECT | ||
79 | 94 | ||
80 | #elif (CONFIG_KEYPAD == SANSA_FUZE_PAD) | 95 | #elif (CONFIG_KEYPAD == SANSA_FUZE_PAD) |
81 | #define PLASMA_QUIT (BUTTON_HOME|BUTTON_REPEAT) | 96 | #define PLASMA_QUIT (BUTTON_HOME|BUTTON_REPEAT) |
82 | #define PLASMA_INCREASE_FREQUENCY BUTTON_UP | 97 | #define PLASMA_INCREASE_FREQUENCY BUTTON_UP |
83 | #define PLASMA_DECREASE_FREQUENCY BUTTON_DOWN | 98 | #define PLASMA_DECREASE_FREQUENCY BUTTON_DOWN |
99 | #define PLASMA_REGEN_COLORS BUTTON_SELECT | ||
84 | 100 | ||
85 | #elif (CONFIG_KEYPAD == IAUDIO_X5M5_PAD) | 101 | #elif (CONFIG_KEYPAD == IAUDIO_X5M5_PAD) |
86 | #define PLASMA_QUIT BUTTON_POWER | 102 | #define PLASMA_QUIT BUTTON_POWER |
87 | #define PLASMA_INCREASE_FREQUENCY BUTTON_UP | 103 | #define PLASMA_INCREASE_FREQUENCY BUTTON_UP |
88 | #define PLASMA_DECREASE_FREQUENCY BUTTON_DOWN | 104 | #define PLASMA_DECREASE_FREQUENCY BUTTON_DOWN |
105 | #define PLASMA_REGEN_COLORS BUTTON_PLAY | ||
89 | 106 | ||
90 | #elif (CONFIG_KEYPAD == IRIVER_H10_PAD) | 107 | #elif (CONFIG_KEYPAD == IRIVER_H10_PAD) |
91 | #define PLASMA_QUIT BUTTON_POWER | 108 | #define PLASMA_QUIT BUTTON_POWER |
92 | #define PLASMA_INCREASE_FREQUENCY BUTTON_SCROLL_UP | 109 | #define PLASMA_INCREASE_FREQUENCY BUTTON_SCROLL_UP |
93 | #define PLASMA_DECREASE_FREQUENCY BUTTON_SCROLL_DOWN | 110 | #define PLASMA_DECREASE_FREQUENCY BUTTON_SCROLL_DOWN |
111 | #define PLASMA_REGEN_COLORS BUTTON_PLAY | ||
94 | 112 | ||
95 | #elif (CONFIG_KEYPAD == GIGABEAT_S_PAD) | 113 | #elif (CONFIG_KEYPAD == GIGABEAT_S_PAD) |
96 | #define PLASMA_QUIT BUTTON_BACK | 114 | #define PLASMA_QUIT BUTTON_BACK |
97 | #define PLASMA_INCREASE_FREQUENCY BUTTON_UP | 115 | #define PLASMA_INCREASE_FREQUENCY BUTTON_UP |
98 | #define PLASMA_DECREASE_FREQUENCY BUTTON_DOWN | 116 | #define PLASMA_DECREASE_FREQUENCY BUTTON_DOWN |
117 | #define PLASMA_REGEN_COLORS BUTTON_SELECT | ||
99 | 118 | ||
100 | #elif (CONFIG_KEYPAD == MROBE100_PAD) | 119 | #elif (CONFIG_KEYPAD == MROBE100_PAD) |
101 | #define PLASMA_QUIT BUTTON_POWER | 120 | #define PLASMA_QUIT BUTTON_POWER |
102 | #define PLASMA_INCREASE_FREQUENCY BUTTON_UP | 121 | #define PLASMA_INCREASE_FREQUENCY BUTTON_UP |
103 | #define PLASMA_DECREASE_FREQUENCY BUTTON_DOWN | 122 | #define PLASMA_DECREASE_FREQUENCY BUTTON_DOWN |
104 | 123 | ||
105 | #elif (CONFIG_KEYPAD == IAUDIO_M3_PAD) | 124 | #elif (CONFIG_KEYPAD == IAUDIO_M3_PAD) |
106 | #define PLASMA_QUIT BUTTON_RC_REC | 125 | #define PLASMA_QUIT BUTTON_RC_REC |
107 | #define PLASMA_INCREASE_FREQUENCY BUTTON_RC_VOL_UP | 126 | #define PLASMA_INCREASE_FREQUENCY BUTTON_RC_VOL_UP |
108 | #define PLASMA_DECREASE_FREQUENCY BUTTON_RC_VOL_DOWN | 127 | #define PLASMA_DECREASE_FREQUENCY BUTTON_RC_VOL_DOWN |
109 | #define PLASMA_RC_QUIT BUTTON_REC | 128 | #define PLASMA_RC_QUIT BUTTON_REC |
110 | 129 | ||
111 | #elif (CONFIG_KEYPAD == COWOND2_PAD) | 130 | #elif (CONFIG_KEYPAD == COWOND2_PAD) |
112 | #define PLASMA_QUIT BUTTON_POWER | 131 | #define PLASMA_QUIT BUTTON_POWER |
113 | 132 | ||
114 | #elif (CONFIG_KEYPAD == IAUDIO67_PAD) | 133 | #elif (CONFIG_KEYPAD == IAUDIO67_PAD) |
115 | #define PLASMA_QUIT BUTTON_POWER | 134 | #define PLASMA_QUIT BUTTON_POWER |
116 | #define PLASMA_INCREASE_FREQUENCY BUTTON_RIGHT | 135 | #define PLASMA_INCREASE_FREQUENCY BUTTON_RIGHT |
117 | #define PLASMA_DECREASE_FREQUENCY BUTTON_LEFT | 136 | #define PLASMA_DECREASE_FREQUENCY BUTTON_LEFT |
137 | #define PLASMA_REGEN_COLORS BUTTON_PLAY | ||
118 | #define PLASMA_RC_QUIT BUTTON_STOP | 138 | #define PLASMA_RC_QUIT BUTTON_STOP |
119 | #define PLASMA_REGEN_COLORS BUTTON_PLAY | ||
120 | 139 | ||
121 | #elif CONFIG_KEYPAD == CREATIVEZVM_PAD | 140 | #elif CONFIG_KEYPAD == CREATIVEZVM_PAD |
122 | #define PLASMA_QUIT BUTTON_BACK | 141 | #define PLASMA_QUIT BUTTON_BACK |
123 | #define PLASMA_INCREASE_FREQUENCY BUTTON_UP | 142 | #define PLASMA_INCREASE_FREQUENCY BUTTON_UP |
124 | #define PLASMA_DECREASE_FREQUENCY BUTTON_DOWN | 143 | #define PLASMA_DECREASE_FREQUENCY BUTTON_DOWN |
125 | #define PLASMA_REGEN_COLORS BUTTON_SELECT | 144 | #define PLASMA_REGEN_COLORS BUTTON_SELECT |
126 | 145 | ||
127 | #elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD | 146 | #elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD |
128 | #define PLASMA_QUIT BUTTON_POWER | 147 | #define PLASMA_QUIT BUTTON_POWER |
129 | #define PLASMA_INCREASE_FREQUENCY BUTTON_UP | 148 | #define PLASMA_INCREASE_FREQUENCY BUTTON_UP |
130 | #define PLASMA_DECREASE_FREQUENCY BUTTON_DOWN | 149 | #define PLASMA_DECREASE_FREQUENCY BUTTON_DOWN |
131 | #define PLASMA_REGEN_COLORS BUTTON_SELECT | 150 | #define PLASMA_REGEN_COLORS BUTTON_SELECT |
132 | 151 | ||
133 | #elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD | 152 | #elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD |
134 | #define PLASMA_QUIT BUTTON_POWER | 153 | #define PLASMA_QUIT BUTTON_POWER |
135 | #define PLASMA_INCREASE_FREQUENCY BUTTON_UP | 154 | #define PLASMA_INCREASE_FREQUENCY BUTTON_UP |
136 | #define PLASMA_DECREASE_FREQUENCY BUTTON_DOWN | 155 | #define PLASMA_DECREASE_FREQUENCY BUTTON_DOWN |
137 | #define PLASMA_REGEN_COLORS BUTTON_PLAY | 156 | #define PLASMA_REGEN_COLORS BUTTON_PLAY |
138 | 157 | ||
139 | #elif (CONFIG_KEYPAD == ONDAVX747_PAD) | 158 | #elif (CONFIG_KEYPAD == ONDAVX747_PAD) |
140 | #define PLASMA_QUIT BUTTON_POWER | 159 | #define PLASMA_QUIT BUTTON_POWER |
@@ -157,47 +176,12 @@ static bool boosted = false; | |||
157 | #ifndef PLASMA_DECREASE_FREQUENCY | 176 | #ifndef PLASMA_DECREASE_FREQUENCY |
158 | #define PLASMA_DECREASE_FREQUENCY BUTTON_MIDLEFT | 177 | #define PLASMA_DECREASE_FREQUENCY BUTTON_MIDLEFT |
159 | #endif | 178 | #endif |
160 | #endif /* HAVE_TOUCHSCREEN */ | ||
161 | |||
162 | #ifndef PLASMA_QUIT | ||
163 | #define PLASMA_QUIT BUTTON_OFF | ||
164 | #endif | ||
165 | #ifndef PLASMA_INCREASE_FREQUENCY | ||
166 | #define PLASMA_INCREASE_FREQUENCY BUTTON_UP | ||
167 | #endif | ||
168 | #ifndef PLASMA_DECREASE_FREQUENCY | ||
169 | #define PLASMA_DECREASE_FREQUENCY BUTTON_DOWN | ||
170 | #endif | ||
171 | |||
172 | #if (CONFIG_KEYPAD == IRIVER_H100_PAD) || (CONFIG_KEYPAD == IRIVER_H300_PAD) | ||
173 | #define PLASMA_RC_QUIT BUTTON_RC_STOP | ||
174 | #endif | ||
175 | |||
176 | /* FIXME: cleanup */ | ||
177 | #ifdef HAVE_LCD_COLOR | 179 | #ifdef HAVE_LCD_COLOR |
178 | #if CONFIG_KEYPAD == IAUDIO_X5M5_PAD | ||
179 | #define PLASMA_REGEN_COLORS BUTTON_PLAY | ||
180 | #elif CONFIG_KEYPAD == IRIVER_H10_PAD | ||
181 | #define PLASMA_REGEN_COLORS BUTTON_PLAY | ||
182 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ | ||
183 | (CONFIG_KEYPAD == SANSA_C200_PAD) || \ | ||
184 | (CONFIG_KEYPAD == SANSA_FUZE_PAD) | ||
185 | #define PLASMA_REGEN_COLORS BUTTON_SELECT | ||
186 | #elif CONFIG_KEYPAD == IPOD_4G_PAD | ||
187 | #define PLASMA_REGEN_COLORS BUTTON_SELECT | ||
188 | #elif CONFIG_KEYPAD == IRIVER_H300_PAD | ||
189 | #define PLASMA_REGEN_COLORS BUTTON_SELECT | ||
190 | #elif CONFIG_KEYPAD == GIGABEAT_PAD | ||
191 | #define PLASMA_REGEN_COLORS BUTTON_SELECT | ||
192 | #elif CONFIG_KEYPAD == GIGABEAT_S_PAD | ||
193 | #define PLASMA_REGEN_COLORS BUTTON_SELECT | ||
194 | #endif | ||
195 | #ifdef HAVE_TOUCHSCREEN | ||
196 | #ifndef PLASMA_REGEN_COLORS | 180 | #ifndef PLASMA_REGEN_COLORS |
197 | #define PLASMA_REGEN_COLORS BUTTON_CENTER | 181 | #define PLASMA_REGEN_COLORS BUTTON_CENTER |
198 | #endif | 182 | #endif |
199 | #endif /* HAVE_TOUCHSCREEN */ | ||
200 | #endif /* HAVE_LCD_COLOR */ | 183 | #endif /* HAVE_LCD_COLOR */ |
184 | #endif /* HAVE_TOUCHSCREEN */ | ||
201 | 185 | ||
202 | #define WAV_AMP 90 | 186 | #define WAV_AMP 90 |
203 | 187 | ||
@@ -268,7 +252,7 @@ static void shades_generate(void) | |||
268 | void cleanup(void *parameter) | 252 | void cleanup(void *parameter) |
269 | { | 253 | { |
270 | (void)parameter; | 254 | (void)parameter; |
271 | 255 | ||
272 | #ifdef HAVE_ADJUSTABLE_CPU_FREQ | 256 | #ifdef HAVE_ADJUSTABLE_CPU_FREQ |
273 | if (boosted) | 257 | if (boosted) |
274 | rb->cpu_boost(false); | 258 | rb->cpu_boost(false); |
@@ -345,7 +329,7 @@ int main(void) | |||
345 | z0 = wave_array[t1] + wave_array[t2]; | 329 | z0 = wave_array[t1] + wave_array[t2]; |
346 | for(x = 0; x < LCD_WIDTH; ++x) | 330 | for(x = 0; x < LCD_WIDTH; ++x) |
347 | { | 331 | { |
348 | z = z0 + wave_array[t3] + wave_array[t4]; | 332 | z = z0 + wave_array[t3] + wave_array[t4]; |
349 | #if defined(HAVE_LCD_MODES) && (HAVE_LCD_MODES & LCD_MODE_PAL256) | 333 | #if defined(HAVE_LCD_MODES) && (HAVE_LCD_MODES & LCD_MODE_PAL256) |
350 | *ptr++ = z; | 334 | *ptr++ = z; |
351 | #else | 335 | #else |
@@ -422,7 +406,7 @@ int main(void) | |||
422 | bluephase=rb->rand()%256; | 406 | bluephase=rb->rand()%256; |
423 | break; | 407 | break; |
424 | #endif | 408 | #endif |
425 | 409 | ||
426 | default: | 410 | default: |
427 | if (rb->default_event_handler_ex(button, cleanup, NULL) | 411 | if (rb->default_event_handler_ex(button, cleanup, NULL) |
428 | == SYS_USB_CONNECTED) | 412 | == SYS_USB_CONNECTED) |