1 files changed, 28 insertions, 10 deletions

diff --git a/apps/plugins/star.c b/apps/plugins/star.c
index 3cb27790c6..9d27432dff 100644
--- a/apps/plugins/star.c
+++ b/apps/plugins/star.c
@@ -391,23 +391,41 @@
 #define STAR_QUIT           BUTTON_POWER
 #define STAR_QUIT_NAME      "POWER"
 
-#elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
-      (CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
+#elif CONFIG_KEYPAD == SAMSUNG_YH820_PAD
 
-#define STAR_QUIT           BUTTON_REC
+#define STAR_QUIT           (BUTTON_REW|BUTTON_REPEAT)
 #define STAR_LEFT           BUTTON_LEFT
 #define STAR_RIGHT          BUTTON_RIGHT
 #define STAR_UP             BUTTON_UP
 #define STAR_DOWN           BUTTON_DOWN
-#define STAR_LEVEL_UP       BUTTON_FFWD
-#define STAR_LEVEL_DOWN     BUTTON_REW
+#define STAR_LEVEL_UP       (BUTTON_REC|BUTTON_UP)
+#define STAR_LEVEL_DOWN     (BUTTON_REC|BUTTON_DOWN)
 #define STAR_TOGGLE_CONTROL BUTTON_PLAY
-#define STAR_LEVEL_REPEAT   (BUTTON_REW|BUTTON_FFWD)
+#define STAR_LEVEL_REPEAT_PRE BUTTON_FFWD
+#define STAR_LEVEL_REPEAT   (BUTTON_FFWD|BUTTON_REPEAT)
 #define STAR_TOGGLE_CONTROL_NAME "PLAY"
-#define STAR_QUIT_NAME      "REC"
-#define STAR_LEVEL_UP_NAME  "FF"
-#define STAR_LEVEL_DOWN_NAME "REW"
-#define STAR_LEVEL_REPEAT_NAME "REW+FF"
+#define STAR_QUIT_NAME          "LONG REW"
+#define STAR_LEVEL_UP_NAME      "REC+UP"
+#define STAR_LEVEL_DOWN_NAME    "REC+DOWN"
+#define STAR_LEVEL_REPEAT_NAME  "LONG FFWD"
+
+#elif CONFIG_KEYPAD == SAMSUNG_YH920_PAD
+
+#define STAR_QUIT           (BUTTON_REW|BUTTON_REPEAT)
+#define STAR_LEFT           BUTTON_LEFT
+#define STAR_RIGHT          BUTTON_RIGHT
+#define STAR_UP             BUTTON_UP
+#define STAR_DOWN           BUTTON_DOWN
+#define STAR_LEVEL_UP       (BUTTON_FFWD|BUTTON_UP)
+#define STAR_LEVEL_DOWN     (BUTTON_FFWD|BUTTON_DOWN)
+#define STAR_TOGGLE_CONTROL (BUTTON_PLAY|BUTTON_REL)
+#define STAR_LEVEL_REPEAT_PRE (BUTTON_FFWD|BUTTON_REPEAT)
+#define STAR_LEVEL_REPEAT   (BUTTON_FFWD|BUTTON_REL)
+#define STAR_TOGGLE_CONTROL_NAME "PLAY"
+#define STAR_QUIT_NAME          "LONG REW"
+#define STAR_LEVEL_UP_NAME      "FFWD+UP"
+#define STAR_LEVEL_DOWN_NAME    "FFWD+DOWN"
+#define STAR_LEVEL_REPEAT_NAME  "LONG FFWD"
 
 #elif CONFIG_KEYPAD == PBELL_VIBE500_PAD