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[]={
     0x00, 0x0A, 0x1F, 0x1F, 0x1F, 0x0e, 0x04  /* (+63)Heart */
 };
 static unsigned long char_patterns[NB_SLOTS];
+#define SLEEP_TIME (HZ/24)
 #else /* bitmaps LCDs */
 
 #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
 #else
 #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
 
 struct jackpot_picture{
@@ -77,7 +78,7 @@ const struct jackpot_picture jackpot_pictures[]={
     }
 #endif
 };
-
+#define SLEEP_TIME (HZ/100)
 #endif /* HAVE_LCD_CHARCELLS */
 
 static struct plugin_api* rb;
@@ -300,7 +301,7 @@ void jackpot_play_turn(struct jackpot* game)
         }
         FOR_NB_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);
     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[] =
 static const struct button_mapping generic_actions[] = 
 {
 #if (CONFIG_KEYPAD == IRIVER_H100_PAD) || (CONFIG_KEYPAD == IRIVER_H300_PAD)
-    {PLA_QUIT,          BUTTON_OFF,     BUTTON_NONE},
-    {PLA_QUIT,          BUTTON_RC_STOP, BUTTON_NONE},
-    {PLA_START,         BUTTON_ON,      BUTTON_NONE},
-    {PLA_START,         BUTTON_RC_ON,   BUTTON_NONE},
-    {PLA_MENU,          BUTTON_MODE,    BUTTON_NONE},
-    {PLA_FIRE,          BUTTON_SELECT,  BUTTON_NONE},
+    {PLA_QUIT,          BUTTON_OFF,                   BUTTON_NONE},
+    {PLA_QUIT,          BUTTON_RC_STOP,               BUTTON_NONE},
+    {PLA_START,         BUTTON_ON,                    BUTTON_NONE},
+    {PLA_START,         BUTTON_RC_ON,                 BUTTON_NONE},
+    {PLA_MENU,          BUTTON_MODE,                  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_RC_MENU|BUTTON_REPEAT, BUTTON_NONE},
 #elif (CONFIG_KEYPAD == IPOD_1G2G_PAD) \
    || (CONFIG_KEYPAD == IPOD_3G_PAD) \
    || (CONFIG_KEYPAD == IPOD_4G_PAD)
@@ -238,12 +240,15 @@ static const struct button_mapping generic_actions[] =
     {PLA_FIRE,          BUTTON_SELECT|BUTTON_REL,       BUTTON_SELECT},
     {PLA_FIRE_REPEAT,   BUTTON_SELECT|BUTTON_REPEAT,    BUTTON_NONE},
 #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD
-    {PLA_QUIT,          BUTTON_POWER,       BUTTON_NONE},
-    {PLA_START,         BUTTON_PLAY,        BUTTON_NONE},
-    {PLA_START,         BUTTON_RC_PLAY,     BUTTON_NONE},
-    {PLA_MENU,          BUTTON_REC,         BUTTON_NONE},
-    {PLA_FIRE,          BUTTON_SELECT,      BUTTON_NONE},
+    {PLA_QUIT,          BUTTON_POWER,                   BUTTON_NONE},
+    {PLA_START,         BUTTON_PLAY,                    BUTTON_NONE},
+    {PLA_START,         BUTTON_RC_PLAY,                 BUTTON_NONE},
+    {PLA_MENU,          BUTTON_REC,                     BUTTON_NONE},
+    {PLA_MENU,          BUTTON_RC_MENU,                 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_RC_MODE|BUTTON_REPEAT,   BUTTON_NONE},
 #elif CONFIG_KEYPAD == GIGABEAT_PAD
     {PLA_QUIT,          BUTTON_A,           BUTTON_NONE},
     {PLA_START,         BUTTON_POWER,       BUTTON_NONE},