diff options
author | Stepan Moskovchenko <stevenm@rockbox.org> | 2006-05-07 07:27:07 +0000 |
---|---|---|
committer | Stepan Moskovchenko <stevenm@rockbox.org> | 2006-05-07 07:27:07 +0000 |
commit | 595a2040204a5f2de2ca3249e215de25983d6711 (patch) | |
tree | 1200a33f2f87d7312031c1155f4750580d4fb958 /apps/plugins | |
parent | 68af7bae87b0fa4f0da080752a73e638f2ecdf21 (diff) | |
download | rockbox-595a2040204a5f2de2ca3249e215de25983d6711.tar.gz rockbox-595a2040204a5f2de2ca3249e215de25983d6711.zip |
Whoops! Lousy button code...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9884 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins')
-rw-r--r-- | apps/plugins/midiplay.c | 54 |
1 files changed, 48 insertions, 6 deletions
diff --git a/apps/plugins/midiplay.c b/apps/plugins/midiplay.c index 70ffaa7d92..4814897906 100644 --- a/apps/plugins/midiplay.c +++ b/apps/plugins/midiplay.c | |||
@@ -20,6 +20,48 @@ | |||
20 | 20 | ||
21 | PLUGIN_HEADER | 21 | PLUGIN_HEADER |
22 | 22 | ||
23 | |||
24 | /* variable button definitions */ | ||
25 | #if CONFIG_KEYPAD == RECORDER_PAD | ||
26 | #define BTN_QUIT BUTTON_OFF | ||
27 | #define BTN_RIGHT BUTTON_RIGHT | ||
28 | #define BTN_UP BUTTON_UP | ||
29 | #define BTN_DOWN BUTTON_DOWN | ||
30 | |||
31 | #elif CONFIG_KEYPAD == ONDIO_PAD | ||
32 | #define BTN_QUIT BUTTON_OFF | ||
33 | #define BTN_RIGHT BUTTON_RIGHT | ||
34 | #define BTN_UP BUTTON_UP | ||
35 | #define BTN_DOWN BUTTON_DOWN | ||
36 | |||
37 | #elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || (CONFIG_KEYPAD == IRIVER_H300_PAD) | ||
38 | #define BTN_QUIT BUTTON_OFF | ||
39 | #define BTN_RIGHT BUTTON_RIGHT | ||
40 | #define BTN_UP BUTTON_UP | ||
41 | #define BTN_DOWN BUTTON_DOWN | ||
42 | |||
43 | #elif (CONFIG_KEYPAD == IPOD_3G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD) | ||
44 | #define BTN_QUIT (BUTTON_SELECT | BUTTON_MENU) | ||
45 | #define BTN_RIGHT BUTTON_RIGHT | ||
46 | #define BTN_UP BUTTON_SCROLL_FWD | ||
47 | #define BTN_DOWN BUTTON_SCROLL_BACK | ||
48 | |||
49 | #elif (CONFIG_KEYPAD == GIGABEAT_PAD) | ||
50 | #define BTN_QUIT BUTTON_POWER | ||
51 | #define BTN_RIGHT BUTTON_RIGHT | ||
52 | #define BTN_UP BUTTON_VOL_UP | ||
53 | #define BTN_DOWN BUTTON_VOL_DOWN | ||
54 | |||
55 | #elif CONFIG_KEYPAD == IAUDIO_X5_PAD | ||
56 | #define BTN_QUIT BUTTON_POWER | ||
57 | #define BTN_RIGHT BUTTON_RIGHT | ||
58 | #define BTN_UP BUTTON_UP | ||
59 | #define BTN_DOWN BUTTON_DOWN | ||
60 | |||
61 | #endif | ||
62 | |||
63 | |||
64 | |||
23 | #define FRACTSIZE 10 | 65 | #define FRACTSIZE 10 |
24 | #define SAMPLE_RATE 22050 // 44100 22050 11025 | 66 | #define SAMPLE_RATE 22050 // 44100 22050 11025 |
25 | #define MAX_VOICES 14 // Note: 24 midi channels is the minimum general midi | 67 | #define MAX_VOICES 14 // Note: 24 midi channels is the minimum general midi |
@@ -220,8 +262,8 @@ int midimain(void * filename) | |||
220 | /* Code taken from Oscilloscope plugin */ | 262 | /* Code taken from Oscilloscope plugin */ |
221 | switch(rb->button_get(false)) | 263 | switch(rb->button_get(false)) |
222 | { | 264 | { |
223 | case BUTTON_UP: | 265 | case BTN_UP: |
224 | case BUTTON_UP | BUTTON_REPEAT: | 266 | case BTN_UP | BUTTON_REPEAT: |
225 | vol = rb->global_settings->volume; | 267 | vol = rb->global_settings->volume; |
226 | if (vol < rb->sound_max(SOUND_VOLUME)) | 268 | if (vol < rb->sound_max(SOUND_VOLUME)) |
227 | { | 269 | { |
@@ -231,8 +273,8 @@ int midimain(void * filename) | |||
231 | } | 273 | } |
232 | break; | 274 | break; |
233 | 275 | ||
234 | case BUTTON_DOWN: | 276 | case BTN_DOWN: |
235 | case BUTTON_DOWN | BUTTON_REPEAT: | 277 | case BTN_DOWN | BUTTON_REPEAT: |
236 | vol = rb->global_settings->volume; | 278 | vol = rb->global_settings->volume; |
237 | if (vol > rb->sound_min(SOUND_VOLUME)) | 279 | if (vol > rb->sound_min(SOUND_VOLUME)) |
238 | { | 280 | { |
@@ -242,7 +284,7 @@ int midimain(void * filename) | |||
242 | } | 284 | } |
243 | break; | 285 | break; |
244 | 286 | ||
245 | case BUTTON_RIGHT: | 287 | case BTN_RIGHT: |
246 | { | 288 | { |
247 | /* Skip 3 seconds */ | 289 | /* Skip 3 seconds */ |
248 | /* Should skip length be retrieved from the RB settings? */ | 290 | /* Should skip length be retrieved from the RB settings? */ |
@@ -254,7 +296,7 @@ int midimain(void * filename) | |||
254 | break; | 296 | break; |
255 | } | 297 | } |
256 | 298 | ||
257 | case BUTTON_OFF: | 299 | case BTN_QUIT: |
258 | quit=1; | 300 | quit=1; |
259 | } | 301 | } |
260 | 302 | ||