3 files changed, 16 insertions, 1 deletions

diff --git a/apps/plugins/lib/pluginlib_actions.c b/apps/plugins/lib/pluginlib_actions.c
index 4ae1b1d894..e5745cda64 100644
--- a/apps/plugins/lib/pluginlib_actions.c
+++ b/apps/plugins/lib/pluginlib_actions.c
@@ -39,7 +39,8 @@ const struct button_mapping remote_directions[] =
     { PLA_RIGHT_REPEAT,      BUTTON_RC_VOL_UP|BUTTON_REPEAT,   BUTTON_NONE},
 #elif (CONFIG_KEYPAD == IAUDIO_X5M5_PAD) || \
       (CONFIG_KEYPAD == IRIVER_H10_PAD) || \
-      (CONFIG_KEYPAD == GIGABEAT_PAD)
+      (CONFIG_KEYPAD == GIGABEAT_PAD) || \
+      (CONFIG_KEYPAD == GIGABEAT_S_PAD)
     { PLA_UP,                BUTTON_RC_FF,                     BUTTON_NONE},
     { PLA_DOWN,              BUTTON_RC_REW,                    BUTTON_NONE},
     { PLA_LEFT,              BUTTON_RC_VOL_DOWN,               BUTTON_NONE},
diff --git a/apps/plugins/mpegplayer/mpeg_settings.c b/apps/plugins/mpegplayer/mpeg_settings.c
index f9f31fa88f..de667ec782 100644
--- a/apps/plugins/mpegplayer/mpeg_settings.c
+++ b/apps/plugins/mpegplayer/mpeg_settings.c
@@ -65,6 +65,13 @@ struct mpeg_settings settings;
 #define MPEG_START_TIME_SCROLL_UP   BUTTON_VOL_UP
 #define MPEG_START_TIME_EXIT        BUTTON_POWER
 
+#define MPEG_START_TIME_RC_SELECT      (BUTTON_RC_PLAY | BUTTON_REL)
+#define MPEG_START_TIME_RC_LEFT        BUTTON_RC_REW
+#define MPEG_START_TIME_RC_RIGHT       BUTTON_RC_FF
+#define MPEG_START_TIME_RC_UP          BUTTON_RC_VOL_UP
+#define MPEG_START_TIME_RC_DOWN        BUTTON_RC_VOL_DOWN
+#define MPEG_START_TIME_RC_EXIT        (BUTTON_RC_PLAY | BUTTON_REPEAT)
+
 #elif CONFIG_KEYPAD == IRIVER_H10_PAD
 #define MPEG_START_TIME_SELECT      BUTTON_PLAY
 #define MPEG_START_TIME_LEFT        BUTTON_LEFT
diff --git a/apps/plugins/mpegplayer/mpegplayer.c b/apps/plugins/mpegplayer/mpegplayer.c
index 66c647ff00..6e8f9350f8 100644
--- a/apps/plugins/mpegplayer/mpegplayer.c
+++ b/apps/plugins/mpegplayer/mpegplayer.c
@@ -170,6 +170,13 @@ PLUGIN_IRAM_DECLARE
 #define MPEG_VOLUP2     BUTTON_VOL_UP
 #define MPEG_RW         BUTTON_UP
 #define MPEG_FF         BUTTON_DOWN
+#define MPEG_RC_MENU    BUTTON_RC_DSP
+#define MPEG_RC_STOP    (BUTTON_RC_PLAY | BUTTON_REPEAT)
+#define MPEG_RC_PAUSE   (BUTTON_RC_PLAY | BUTTON_REL)
+#define MPEG_RC_VOLDOWN BUTTON_RC_VOL_DOWN
+#define MPEG_RC_VOLUP   BUTTON_RC_VOL_UP
+#define MPEG_RC_RW      BUTTON_RC_REW
+#define MPEG_RC_FF      BUTTON_RC_FF
 
 #elif CONFIG_KEYPAD == IRIVER_H10_PAD
 #define MPEG_MENU       BUTTON_LEFT