diff options
Diffstat (limited to 'apps/plugins/sliding_puzzle.c')
-rw-r--r-- | apps/plugins/sliding_puzzle.c | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/apps/plugins/sliding_puzzle.c b/apps/plugins/sliding_puzzle.c index 846fd39bdd..d85d011e13 100644 --- a/apps/plugins/sliding_puzzle.c +++ b/apps/plugins/sliding_puzzle.c | |||
@@ -22,11 +22,15 @@ | |||
22 | /* variable button definitions */ | 22 | /* variable button definitions */ |
23 | #if CONFIG_KEYPAD == RECORDER_PAD | 23 | #if CONFIG_KEYPAD == RECORDER_PAD |
24 | #define PUZZLE_QUIT BUTTON_OFF | 24 | #define PUZZLE_QUIT BUTTON_OFF |
25 | #define PUZZLE_UP BUTTON_UP | ||
26 | #define PUZZLE_DOWN BUTTON_DOWN | ||
25 | #define PUZZLE_SHUFFLE BUTTON_F1 | 27 | #define PUZZLE_SHUFFLE BUTTON_F1 |
26 | #define PUZZLE_PICTURE BUTTON_F2 | 28 | #define PUZZLE_PICTURE BUTTON_F2 |
27 | 29 | ||
28 | #elif CONFIG_KEYPAD == ONDIO_PAD | 30 | #elif CONFIG_KEYPAD == ONDIO_PAD |
29 | #define PUZZLE_QUIT BUTTON_OFF | 31 | #define PUZZLE_QUIT BUTTON_OFF |
32 | #define PUZZLE_UP BUTTON_UP | ||
33 | #define PUZZLE_DOWN BUTTON_DOWN | ||
30 | #define PUZZLE_SHUFFLE_PICTURE_PRE BUTTON_MENU | 34 | #define PUZZLE_SHUFFLE_PICTURE_PRE BUTTON_MENU |
31 | #define PUZZLE_SHUFFLE (BUTTON_MENU | BUTTON_REPEAT) | 35 | #define PUZZLE_SHUFFLE (BUTTON_MENU | BUTTON_REPEAT) |
32 | #define PUZZLE_PICTURE (BUTTON_MENU | BUTTON_REL) | 36 | #define PUZZLE_PICTURE (BUTTON_MENU | BUTTON_REL) |
@@ -34,8 +38,18 @@ | |||
34 | #elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || \ | 38 | #elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || \ |
35 | (CONFIG_KEYPAD == IRIVER_H300_PAD) | 39 | (CONFIG_KEYPAD == IRIVER_H300_PAD) |
36 | #define PUZZLE_QUIT BUTTON_OFF | 40 | #define PUZZLE_QUIT BUTTON_OFF |
41 | #define PUZZLE_UP BUTTON_UP | ||
42 | #define PUZZLE_DOWN BUTTON_DOWN | ||
37 | #define PUZZLE_SHUFFLE BUTTON_SELECT | 43 | #define PUZZLE_SHUFFLE BUTTON_SELECT |
38 | #define PUZZLE_PICTURE BUTTON_ON | 44 | #define PUZZLE_PICTURE BUTTON_ON |
45 | |||
46 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_NANO_PAD) | ||
47 | #define PUZZLE_QUIT BUTTON_MENU | ||
48 | #define PUZZLE_UP BUTTON_SCROLL_BACK | ||
49 | #define PUZZLE_DOWN BUTTON_SCROLL_FWD | ||
50 | #define PUZZLE_SHUFFLE BUTTON_SELECT | ||
51 | #define PUZZLE_PICTURE BUTTON_PLAY | ||
52 | |||
39 | #endif | 53 | #endif |
40 | 54 | ||
41 | static struct plugin_api* rb; | 55 | static struct plugin_api* rb; |
@@ -295,12 +309,12 @@ static int puzzle_loop(void) | |||
295 | move_spot(1, 0); | 309 | move_spot(1, 0); |
296 | break; | 310 | break; |
297 | 311 | ||
298 | case BUTTON_UP: | 312 | case PUZZLE_UP: |
299 | if ((hole/5)<3 && !puzzle_finished()) | 313 | if ((hole/5)<3 && !puzzle_finished()) |
300 | move_spot(0, -1); | 314 | move_spot(0, -1); |
301 | break; | 315 | break; |
302 | 316 | ||
303 | case BUTTON_DOWN: | 317 | case PUZZLE_DOWN: |
304 | if ((hole/5)>0 && !puzzle_finished()) | 318 | if ((hole/5)>0 && !puzzle_finished()) |
305 | move_spot(0, 1); | 319 | move_spot(0, 1); |
306 | break; | 320 | break; |