diff options
author | Kevin Ferrare <kevin@rockbox.org> | 2007-07-28 05:42:55 +0000 |
---|---|---|
committer | Kevin Ferrare <kevin@rockbox.org> | 2007-07-28 05:42:55 +0000 |
commit | 885cdfdeb98d54b2597e65f1b9ae9ab98da8286f (patch) | |
tree | a8e92b9a1038013875d37b9abed017bdef9299cc | |
parent | ffa978d54d6a89ba2d670c4598dba74f45ec08d3 (diff) | |
download | rockbox-885cdfdeb98d54b2597e65f1b9ae9ab98da8286f.tar.gz rockbox-885cdfdeb98d54b2597e65f1b9ae9ab98da8286f.zip |
fixed the speed problem on bitmaps LCD for the jackpot plugin and added the remote key bindings for h1x0 and x5
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14034 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/plugins/jackpot.c | 7 | ||||
-rw-r--r-- | apps/plugins/lib/pluginlib_actions.h | 27 |
2 files changed, 20 insertions, 14 deletions
diff --git a/apps/plugins/jackpot.c b/apps/plugins/jackpot.c index bcb12f1a33..e5518b7bbc 100644 --- a/apps/plugins/jackpot.c +++ b/apps/plugins/jackpot.c | |||
@@ -41,6 +41,7 @@ static unsigned char jackpot_slots_patterns[]={ | |||
41 | 0x00, 0x0A, 0x1F, 0x1F, 0x1F, 0x0e, 0x04 /* (+63)Heart */ | 41 | 0x00, 0x0A, 0x1F, 0x1F, 0x1F, 0x0e, 0x04 /* (+63)Heart */ |
42 | }; | 42 | }; |
43 | static unsigned long char_patterns[NB_SLOTS]; | 43 | static unsigned long char_patterns[NB_SLOTS]; |
44 | #define SLEEP_TIME (HZ/24) | ||
44 | #else /* bitmaps LCDs */ | 45 | #else /* bitmaps LCDs */ |
45 | 46 | ||
46 | #define PICTURE_HEIGHT (BMPHEIGHT_jackpot_slots/(NB_PICTURES+1)) | 47 | #define PICTURE_HEIGHT (BMPHEIGHT_jackpot_slots/(NB_PICTURES+1)) |
@@ -48,7 +49,7 @@ static unsigned long char_patterns[NB_SLOTS]; | |||
48 | #define PICTURE_ROTATION_STEPS PICTURE_HEIGHT | 49 | #define PICTURE_ROTATION_STEPS PICTURE_HEIGHT |
49 | #else | 50 | #else |
50 | #define REMOTE_PICTURE_HEIGHT (BMPHEIGHT_jackpot_slots_remote/(NB_PICTURES+1)) | 51 | #define REMOTE_PICTURE_HEIGHT (BMPHEIGHT_jackpot_slots_remote/(NB_PICTURES+1)) |
51 | #define PICTURE_ROTATION_STEPS (REMOTE_PICTURE_HEIGHT*PICTURE_HEIGHT) | 52 | #define PICTURE_ROTATION_STEPS REMOTE_PICTURE_HEIGHT |
52 | #endif | 53 | #endif |
53 | 54 | ||
54 | struct jackpot_picture{ | 55 | struct jackpot_picture{ |
@@ -77,7 +78,7 @@ const struct jackpot_picture jackpot_pictures[]={ | |||
77 | } | 78 | } |
78 | #endif | 79 | #endif |
79 | }; | 80 | }; |
80 | 81 | #define SLEEP_TIME (HZ/100) | |
81 | #endif /* HAVE_LCD_CHARCELLS */ | 82 | #endif /* HAVE_LCD_CHARCELLS */ |
82 | 83 | ||
83 | static struct plugin_api* rb; | 84 | static struct plugin_api* rb; |
@@ -300,7 +301,7 @@ void jackpot_play_turn(struct jackpot* game) | |||
300 | } | 301 | } |
301 | FOR_NB_SCREENS(d) | 302 | FOR_NB_SCREENS(d) |
302 | jackpot_display_slot_machine(game, rb->screens[d]); | 303 | jackpot_display_slot_machine(game, rb->screens[d]); |
303 | rb->sleep(7*HZ/(24*PICTURE_ROTATION_STEPS)); | 304 | rb->sleep(SLEEP_TIME); |
304 | } | 305 | } |
305 | gain=jackpot_get_gain(game); | 306 | gain=jackpot_get_gain(game); |
306 | if(gain!=0) | 307 | if(gain!=0) |
diff --git a/apps/plugins/lib/pluginlib_actions.h b/apps/plugins/lib/pluginlib_actions.h index e350d31aae..c38745a4f1 100644 --- a/apps/plugins/lib/pluginlib_actions.h +++ b/apps/plugins/lib/pluginlib_actions.h | |||
@@ -222,13 +222,15 @@ static const struct button_mapping generic_left_right_fire[] = | |||
222 | static const struct button_mapping generic_actions[] = | 222 | static const struct button_mapping generic_actions[] = |
223 | { | 223 | { |
224 | #if (CONFIG_KEYPAD == IRIVER_H100_PAD) || (CONFIG_KEYPAD == IRIVER_H300_PAD) | 224 | #if (CONFIG_KEYPAD == IRIVER_H100_PAD) || (CONFIG_KEYPAD == IRIVER_H300_PAD) |
225 | {PLA_QUIT, BUTTON_OFF, BUTTON_NONE}, | 225 | {PLA_QUIT, BUTTON_OFF, BUTTON_NONE}, |
226 | {PLA_QUIT, BUTTON_RC_STOP, BUTTON_NONE}, | 226 | {PLA_QUIT, BUTTON_RC_STOP, BUTTON_NONE}, |
227 | {PLA_START, BUTTON_ON, BUTTON_NONE}, | 227 | {PLA_START, BUTTON_ON, BUTTON_NONE}, |
228 | {PLA_START, BUTTON_RC_ON, BUTTON_NONE}, | 228 | {PLA_START, BUTTON_RC_ON, BUTTON_NONE}, |
229 | {PLA_MENU, BUTTON_MODE, BUTTON_NONE}, | 229 | {PLA_MENU, BUTTON_MODE, BUTTON_NONE}, |
230 | {PLA_FIRE, BUTTON_SELECT, BUTTON_NONE}, | 230 | {PLA_FIRE, BUTTON_SELECT, BUTTON_NONE}, |
231 | {PLA_FIRE, BUTTON_RC_MENU, BUTTON_NONE}, | ||
231 | {PLA_FIRE_REPEAT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE}, | 232 | {PLA_FIRE_REPEAT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE}, |
233 | {PLA_FIRE_REPEAT, BUTTON_RC_MENU|BUTTON_REPEAT, BUTTON_NONE}, | ||
232 | #elif (CONFIG_KEYPAD == IPOD_1G2G_PAD) \ | 234 | #elif (CONFIG_KEYPAD == IPOD_1G2G_PAD) \ |
233 | || (CONFIG_KEYPAD == IPOD_3G_PAD) \ | 235 | || (CONFIG_KEYPAD == IPOD_3G_PAD) \ |
234 | || (CONFIG_KEYPAD == IPOD_4G_PAD) | 236 | || (CONFIG_KEYPAD == IPOD_4G_PAD) |
@@ -238,12 +240,15 @@ static const struct button_mapping generic_actions[] = | |||
238 | {PLA_FIRE, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT}, | 240 | {PLA_FIRE, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT}, |
239 | {PLA_FIRE_REPEAT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE}, | 241 | {PLA_FIRE_REPEAT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE}, |
240 | #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD | 242 | #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD |
241 | {PLA_QUIT, BUTTON_POWER, BUTTON_NONE}, | 243 | {PLA_QUIT, BUTTON_POWER, BUTTON_NONE}, |
242 | {PLA_START, BUTTON_PLAY, BUTTON_NONE}, | 244 | {PLA_START, BUTTON_PLAY, BUTTON_NONE}, |
243 | {PLA_START, BUTTON_RC_PLAY, BUTTON_NONE}, | 245 | {PLA_START, BUTTON_RC_PLAY, BUTTON_NONE}, |
244 | {PLA_MENU, BUTTON_REC, BUTTON_NONE}, | 246 | {PLA_MENU, BUTTON_REC, BUTTON_NONE}, |
245 | {PLA_FIRE, BUTTON_SELECT, BUTTON_NONE}, | 247 | {PLA_MENU, BUTTON_RC_MENU, BUTTON_NONE}, |
248 | {PLA_FIRE, BUTTON_SELECT, BUTTON_NONE}, | ||
249 | {PLA_FIRE, BUTTON_RC_MODE, BUTTON_NONE}, | ||
246 | {PLA_FIRE_REPEAT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE}, | 250 | {PLA_FIRE_REPEAT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE}, |
251 | {PLA_FIRE_REPEAT, BUTTON_RC_MODE|BUTTON_REPEAT, BUTTON_NONE}, | ||
247 | #elif CONFIG_KEYPAD == GIGABEAT_PAD | 252 | #elif CONFIG_KEYPAD == GIGABEAT_PAD |
248 | {PLA_QUIT, BUTTON_A, BUTTON_NONE}, | 253 | {PLA_QUIT, BUTTON_A, BUTTON_NONE}, |
249 | {PLA_START, BUTTON_POWER, BUTTON_NONE}, | 254 | {PLA_START, BUTTON_POWER, BUTTON_NONE}, |