2 files changed, 22 insertions, 4 deletions

diff --git a/apps/plugins/mpegplayer/mpeg_settings.c b/apps/plugins/mpegplayer/mpeg_settings.c
index 189bdbcde7..8aea93b8f1 100644
--- a/apps/plugins/mpegplayer/mpeg_settings.c
+++ b/apps/plugins/mpegplayer/mpeg_settings.c
@@ -80,8 +80,7 @@ struct mpeg_settings settings;
 #define MPEG_START_TIME_DOWN        BUTTON_SCROLL_DOWN
 #define MPEG_START_TIME_EXIT        BUTTON_POWER
 
-#elif (CONFIG_KEYPAD == SANSA_E200_PAD) \
-    || (CONFIG_KEYPAD == SANSA_FUZE_PAD)
+#elif (CONFIG_KEYPAD == SANSA_E200_PAD)
 #define MPEG_START_TIME_SELECT      BUTTON_SELECT
 #define MPEG_START_TIME_SCROLL_UP   BUTTON_SCROLL_BACK
 #define MPEG_START_TIME_SCROLL_DOWN BUTTON_SCROLL_FWD
@@ -91,6 +90,16 @@ struct mpeg_settings settings;
 #define MPEG_START_TIME_DOWN        BUTTON_DOWN
 #define MPEG_START_TIME_EXIT        BUTTON_POWER
 
+#elif (CONFIG_KEYPAD == SANSA_FUZE_PAD)
+#define MPEG_START_TIME_SELECT      BUTTON_SELECT
+#define MPEG_START_TIME_SCROLL_UP   BUTTON_SCROLL_BACK
+#define MPEG_START_TIME_SCROLL_DOWN BUTTON_SCROLL_FWD
+#define MPEG_START_TIME_LEFT        BUTTON_LEFT
+#define MPEG_START_TIME_RIGHT       BUTTON_RIGHT
+#define MPEG_START_TIME_UP          BUTTON_UP
+#define MPEG_START_TIME_DOWN        BUTTON_DOWN
+#define MPEG_START_TIME_EXIT        (BUTTON_HOME|BUTTON_REPEAT)
+
 #elif (CONFIG_KEYPAD == SANSA_C200_PAD) || \
 (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \
 (CONFIG_KEYPAD == SANSA_M200_PAD)
diff --git a/apps/plugins/mpegplayer/mpegplayer.c b/apps/plugins/mpegplayer/mpegplayer.c
index 0ade023185..0a12a78ceb 100644
--- a/apps/plugins/mpegplayer/mpegplayer.c
+++ b/apps/plugins/mpegplayer/mpegplayer.c
@@ -187,8 +187,7 @@ PLUGIN_IRAM_DECLARE
 #define MPEG_RW         BUTTON_REW
 #define MPEG_FF         BUTTON_FF
 
-#elif CONFIG_KEYPAD == SANSA_E200_PAD \
-    || CONFIG_KEYPAD == SANSA_FUZE_PAD
+#elif CONFIG_KEYPAD == SANSA_E200_PAD
 #define MPEG_MENU       BUTTON_SELECT
 #define MPEG_STOP       BUTTON_POWER
 #define MPEG_PAUSE      BUTTON_UP
@@ -197,6 +196,16 @@ PLUGIN_IRAM_DECLARE
 #define MPEG_RW         BUTTON_LEFT
 #define MPEG_FF         BUTTON_RIGHT
 
+#elif CONFIG_KEYPAD == SANSA_FUZE_PAD
+#define MPEG_MENU       BUTTON_SELECT
+#define MPEG_STOP       (BUTTON_HOME|BUTTON_REPEAT)
+#define MPEG_PAUSE      BUTTON_UP
+#define MPEG_VOLDOWN    BUTTON_SCROLL_BACK
+#define MPEG_VOLUP      BUTTON_SCROLL_FWD
+#define MPEG_RW         BUTTON_LEFT
+#define MPEG_FF         BUTTON_RIGHT
+
+
 #elif CONFIG_KEYPAD == SANSA_C200_PAD || \
 CONFIG_KEYPAD == SANSA_CLIP_PAD || \
 CONFIG_KEYPAD == SANSA_M200_PAD