diff options
Diffstat (limited to 'apps/plugins/star.c')
-rw-r--r-- | apps/plugins/star.c | 29 |
1 files changed, 24 insertions, 5 deletions
diff --git a/apps/plugins/star.c b/apps/plugins/star.c index 9dd3659f52..ac85738577 100644 --- a/apps/plugins/star.c +++ b/apps/plugins/star.c | |||
@@ -62,6 +62,8 @@ | |||
62 | /* variable button definitions */ | 62 | /* variable button definitions */ |
63 | #if CONFIG_KEYPAD == RECORDER_PAD | 63 | #if CONFIG_KEYPAD == RECORDER_PAD |
64 | #define STAR_QUIT BUTTON_OFF | 64 | #define STAR_QUIT BUTTON_OFF |
65 | #define STAR_UP BUTTON_UP | ||
66 | #define STAR_DOWN BUTTON_DOWN | ||
65 | #define STAR_TOGGLE_CONTROL BUTTON_ON | 67 | #define STAR_TOGGLE_CONTROL BUTTON_ON |
66 | #define STAR_TOGGLE_CONTROL2 BUTTON_PLAY | 68 | #define STAR_TOGGLE_CONTROL2 BUTTON_PLAY |
67 | #define STAR_LEVEL_UP BUTTON_F3 | 69 | #define STAR_LEVEL_UP BUTTON_F3 |
@@ -73,6 +75,8 @@ | |||
73 | 75 | ||
74 | #elif CONFIG_KEYPAD == ONDIO_PAD | 76 | #elif CONFIG_KEYPAD == ONDIO_PAD |
75 | #define STAR_QUIT BUTTON_OFF | 77 | #define STAR_QUIT BUTTON_OFF |
78 | #define STAR_UP BUTTON_UP | ||
79 | #define STAR_DOWN BUTTON_DOWN | ||
76 | #define STAR_TOGGLE_CONTROL_PRE BUTTON_MENU | 80 | #define STAR_TOGGLE_CONTROL_PRE BUTTON_MENU |
77 | #define STAR_TOGGLE_CONTROL (BUTTON_MENU | BUTTON_REL) | 81 | #define STAR_TOGGLE_CONTROL (BUTTON_MENU | BUTTON_REL) |
78 | #define STAR_LEVEL_UP (BUTTON_MENU | BUTTON_RIGHT) | 82 | #define STAR_LEVEL_UP (BUTTON_MENU | BUTTON_RIGHT) |
@@ -83,12 +87,27 @@ | |||
83 | #elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || \ | 87 | #elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || \ |
84 | (CONFIG_KEYPAD == IRIVER_H300_PAD) | 88 | (CONFIG_KEYPAD == IRIVER_H300_PAD) |
85 | #define STAR_QUIT BUTTON_OFF | 89 | #define STAR_QUIT BUTTON_OFF |
90 | #define STAR_UP BUTTON_UP | ||
91 | #define STAR_DOWN BUTTON_DOWN | ||
86 | #define STAR_TOGGLE_CONTROL_PRE BUTTON_MODE | 92 | #define STAR_TOGGLE_CONTROL_PRE BUTTON_MODE |
87 | #define STAR_TOGGLE_CONTROL (BUTTON_MODE | BUTTON_REL) | 93 | #define STAR_TOGGLE_CONTROL (BUTTON_MODE | BUTTON_REL) |
88 | #define STAR_LEVEL_UP (BUTTON_MODE | BUTTON_RIGHT) | 94 | #define STAR_LEVEL_UP (BUTTON_MODE | BUTTON_RIGHT) |
89 | #define STAR_LEVEL_DOWN (BUTTON_MODE | BUTTON_LEFT) | 95 | #define STAR_LEVEL_DOWN (BUTTON_MODE | BUTTON_LEFT) |
90 | #define STAR_LEVEL_REPEAT (BUTTON_MODE | BUTTON_UP) | 96 | #define STAR_LEVEL_REPEAT (BUTTON_MODE | BUTTON_UP) |
91 | #define STAR_MENU_RUN BUTTON_RIGHT | 97 | #define STAR_MENU_RUN BUTTON_RIGHT |
98 | |||
99 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_NANO_PAD) | ||
100 | |||
101 | #define STAR_QUIT (BUTTON_SELECT | BUTTON_MENU) | ||
102 | #define STAR_UP BUTTON_SCROLL_BACK | ||
103 | #define STAR_DOWN BUTTON_SCROLL_FWD | ||
104 | #define STAR_TOGGLE_CONTROL_PRE BUTTON_MENU | ||
105 | #define STAR_TOGGLE_CONTROL (BUTTON_MENU | BUTTON_REL) | ||
106 | #define STAR_LEVEL_UP (BUTTON_SELECT | BUTTON_RIGHT) | ||
107 | #define STAR_LEVEL_DOWN (BUTTON_SELECT | BUTTON_LEFT) | ||
108 | #define STAR_LEVEL_REPEAT (BUTTON_SELECT | BUTTON_PLAY) | ||
109 | #define STAR_MENU_RUN BUTTON_RIGHT | ||
110 | |||
92 | #endif | 111 | #endif |
93 | 112 | ||
94 | /* function returns because of USB? */ | 113 | /* function returns because of USB? */ |
@@ -427,7 +446,7 @@ static void star_display_text(char *str, bool waitkey) | |||
427 | switch (key) | 446 | switch (key) |
428 | { | 447 | { |
429 | case STAR_MENU_RUN: | 448 | case STAR_MENU_RUN: |
430 | case BUTTON_DOWN: | 449 | case STAR_DOWN: |
431 | go_on = true; | 450 | go_on = true; |
432 | break; | 451 | break; |
433 | 452 | ||
@@ -601,11 +620,11 @@ static int star_run_game(void) | |||
601 | move_x = 1; | 620 | move_x = 1; |
602 | break; | 621 | break; |
603 | 622 | ||
604 | case BUTTON_UP: | 623 | case STAR_UP: |
605 | move_y = -1; | 624 | move_y = -1; |
606 | break; | 625 | break; |
607 | 626 | ||
608 | case BUTTON_DOWN: | 627 | case STAR_DOWN: |
609 | move_y = 1; | 628 | move_y = 1; |
610 | break; | 629 | break; |
611 | 630 | ||
@@ -777,11 +796,11 @@ static int star_menu(void) | |||
777 | { | 796 | { |
778 | case STAR_QUIT: | 797 | case STAR_QUIT: |
779 | return PLUGIN_OK; | 798 | return PLUGIN_OK; |
780 | case BUTTON_UP: | 799 | case STAR_UP: |
781 | if (menu_y > 0) | 800 | if (menu_y > 0) |
782 | move_y = -1; | 801 | move_y = -1; |
783 | break; | 802 | break; |
784 | case BUTTON_DOWN: | 803 | case STAR_DOWN: |
785 | if (menu_y < 3) | 804 | if (menu_y < 3) |
786 | move_y = 1; | 805 | move_y = 1; |
787 | break; | 806 | break; |