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
This commit is contained in:
Kevin Ferrare 2007-07-28 05:42:55 +00:00
parent ffa978d54d
commit 885cdfdeb9
2 changed files with 20 additions and 14 deletions

View file

@ -41,6 +41,7 @@ static unsigned char jackpot_slots_patterns[]={
0x00, 0x0A, 0x1F, 0x1F, 0x1F, 0x0e, 0x04 /* (+63)Heart */ 0x00, 0x0A, 0x1F, 0x1F, 0x1F, 0x0e, 0x04 /* (+63)Heart */
}; };
static unsigned long char_patterns[NB_SLOTS]; static unsigned long char_patterns[NB_SLOTS];
#define SLEEP_TIME (HZ/24)
#else /* bitmaps LCDs */ #else /* bitmaps LCDs */
#define PICTURE_HEIGHT (BMPHEIGHT_jackpot_slots/(NB_PICTURES+1)) #define PICTURE_HEIGHT (BMPHEIGHT_jackpot_slots/(NB_PICTURES+1))
@ -48,7 +49,7 @@ static unsigned long char_patterns[NB_SLOTS];
#define PICTURE_ROTATION_STEPS PICTURE_HEIGHT #define PICTURE_ROTATION_STEPS PICTURE_HEIGHT
#else #else
#define REMOTE_PICTURE_HEIGHT (BMPHEIGHT_jackpot_slots_remote/(NB_PICTURES+1)) #define REMOTE_PICTURE_HEIGHT (BMPHEIGHT_jackpot_slots_remote/(NB_PICTURES+1))
#define PICTURE_ROTATION_STEPS (REMOTE_PICTURE_HEIGHT*PICTURE_HEIGHT) #define PICTURE_ROTATION_STEPS REMOTE_PICTURE_HEIGHT
#endif #endif
struct jackpot_picture{ struct jackpot_picture{
@ -77,7 +78,7 @@ const struct jackpot_picture jackpot_pictures[]={
} }
#endif #endif
}; };
#define SLEEP_TIME (HZ/100)
#endif /* HAVE_LCD_CHARCELLS */ #endif /* HAVE_LCD_CHARCELLS */
static struct plugin_api* rb; static struct plugin_api* rb;
@ -300,7 +301,7 @@ void jackpot_play_turn(struct jackpot* game)
} }
FOR_NB_SCREENS(d) FOR_NB_SCREENS(d)
jackpot_display_slot_machine(game, rb->screens[d]); jackpot_display_slot_machine(game, rb->screens[d]);
rb->sleep(7*HZ/(24*PICTURE_ROTATION_STEPS)); rb->sleep(SLEEP_TIME);
} }
gain=jackpot_get_gain(game); gain=jackpot_get_gain(game);
if(gain!=0) if(gain!=0)

View file

@ -228,7 +228,9 @@ static const struct button_mapping generic_actions[] =
{PLA_START, BUTTON_RC_ON, BUTTON_NONE}, {PLA_START, BUTTON_RC_ON, BUTTON_NONE},
{PLA_MENU, BUTTON_MODE, BUTTON_NONE}, {PLA_MENU, BUTTON_MODE, BUTTON_NONE},
{PLA_FIRE, BUTTON_SELECT, BUTTON_NONE}, {PLA_FIRE, BUTTON_SELECT, BUTTON_NONE},
{PLA_FIRE, BUTTON_RC_MENU, BUTTON_NONE},
{PLA_FIRE_REPEAT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE}, {PLA_FIRE_REPEAT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE},
{PLA_FIRE_REPEAT, BUTTON_RC_MENU|BUTTON_REPEAT, BUTTON_NONE},
#elif (CONFIG_KEYPAD == IPOD_1G2G_PAD) \ #elif (CONFIG_KEYPAD == IPOD_1G2G_PAD) \
|| (CONFIG_KEYPAD == IPOD_3G_PAD) \ || (CONFIG_KEYPAD == IPOD_3G_PAD) \
|| (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD)
@ -242,8 +244,11 @@ static const struct button_mapping generic_actions[] =
{PLA_START, BUTTON_PLAY, BUTTON_NONE}, {PLA_START, BUTTON_PLAY, BUTTON_NONE},
{PLA_START, BUTTON_RC_PLAY, BUTTON_NONE}, {PLA_START, BUTTON_RC_PLAY, BUTTON_NONE},
{PLA_MENU, BUTTON_REC, BUTTON_NONE}, {PLA_MENU, BUTTON_REC, BUTTON_NONE},
{PLA_MENU, BUTTON_RC_MENU, BUTTON_NONE},
{PLA_FIRE, BUTTON_SELECT, BUTTON_NONE}, {PLA_FIRE, BUTTON_SELECT, BUTTON_NONE},
{PLA_FIRE, BUTTON_RC_MODE, BUTTON_NONE},
{PLA_FIRE_REPEAT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE}, {PLA_FIRE_REPEAT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE},
{PLA_FIRE_REPEAT, BUTTON_RC_MODE|BUTTON_REPEAT, BUTTON_NONE},
#elif CONFIG_KEYPAD == GIGABEAT_PAD #elif CONFIG_KEYPAD == GIGABEAT_PAD
{PLA_QUIT, BUTTON_A, BUTTON_NONE}, {PLA_QUIT, BUTTON_A, BUTTON_NONE},
{PLA_START, BUTTON_POWER, BUTTON_NONE}, {PLA_START, BUTTON_POWER, BUTTON_NONE},