summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--apps/plugins/fft/fft.c15
-rw-r--r--apps/plugins/mpegplayer/mpegplayer.c9
-rw-r--r--apps/plugins/pegbox.c15
-rw-r--r--apps/plugins/sudoku/sudoku.h1
4 files changed, 15 insertions, 25 deletions
diff --git a/apps/plugins/fft/fft.c b/apps/plugins/fft/fft.c
index 28c3cd045c..9f51102979 100644
--- a/apps/plugins/fft/fft.c
+++ b/apps/plugins/fft/fft.c
@@ -303,13 +303,14 @@ GREY_INFO_STRUCT
# define FFT_QUIT BUTTON_POWER
#elif (CONFIG_KEYPAD == SONY_NWZ_PAD)
-#define FFT_PREV_GRAPH BUTTON_LEFT
-#define FFT_NEXT_GRAPH BUTTON_RIGHT
-#define FFT_AMP_SCALE BUTTON_UP
-#define FFT_FREQ_SCALE BUTTON_DOWN
-#define FFT_QUIT BUTTON_BACK
-#define FFT_ORIENTATION BUTTON_POWER
-#define FFT_WINDOW BUTTON_PLAY
+# define FFT_PREV_GRAPH BUTTON_LEFT
+# define FFT_NEXT_GRAPH BUTTON_RIGHT
+# define FFT_AMP_SCALE BUTTON_UP
+# define FFT_FREQ_SCALE BUTTON_DOWN
+# define FFT_QUIT BUTTON_BACK
+# define FFT_ORIENTATION BUTTON_POWER
+# define FFT_WINDOW BUTTON_PLAY
+
#elif !defined(HAVE_TOUCHSCREEN)
#error No keymap defined!
diff --git a/apps/plugins/mpegplayer/mpegplayer.c b/apps/plugins/mpegplayer/mpegplayer.c
index 69062d5062..fbef00d884 100644
--- a/apps/plugins/mpegplayer/mpegplayer.c
+++ b/apps/plugins/mpegplayer/mpegplayer.c
@@ -403,10 +403,11 @@ CONFIG_KEYPAD == SANSA_M200_PAD
#define MPEG_MENU BUTTON_BACK
#define MPEG_PAUSE BUTTON_PLAY
#define MPEG_STOP BUTTON_POWER
-#define MPEG_VOLDOWN BUTTON_LEFT
-#define MPEG_VOLUP BUTTON_RIGHT
-#define MPEG_RW BUTTON_UP
-#define MPEG_FF BUTTON_DOWN
+#define MPEG_VOLDOWN BUTTON_UP
+#define MPEG_VOLUP BUTTON_DOWN
+#define MPEG_RW BUTTON_LEFT
+#define MPEG_FF BUTTON_RIGHT
+
#else
#error No keymap defined!
diff --git a/apps/plugins/pegbox.c b/apps/plugins/pegbox.c
index c3a99389f5..28069a551d 100644
--- a/apps/plugins/pegbox.c
+++ b/apps/plugins/pegbox.c
@@ -425,7 +425,6 @@ CONFIG_KEYPAD == MROBE500_PAD
#define PEGBOX_LEFT BUTTON_LEFT
#define PEGBOX_SELECT BUTTON_PLAY
-#define SAVE_TEXT "FFWD"
#define QUIT_TEXT "REC"
#define RESTART_TEXT "REW"
#define LVL_UP_TEXT "PLAY+FFWD"
@@ -443,7 +442,6 @@ CONFIG_KEYPAD == MROBE500_PAD
#define PEGBOX_LEFT BUTTON_LEFT
#define PEGBOX_SELECT BUTTON_PLAY
-#define SAVE_TEXT "REC + FFWD"
#define QUIT_TEXT "REC + PLAY"
#define RESTART_TEXT "REC + REW"
#define LVL_UP_TEXT "FFWD"
@@ -461,7 +459,6 @@ CONFIG_KEYPAD == MROBE500_PAD
#define PEGBOX_LEFT BUTTON_PREV
#define PEGBOX_SELECT BUTTON_PLAY
-#define SAVE_TEXT "REC + OK"
#define QUIT_TEXT "REC"
#define RESTART_TEXT "MENU"
#define LVL_UP_TEXT "OK"
@@ -479,7 +476,6 @@ CONFIG_KEYPAD == MROBE500_PAD
#define PEGBOX_LEFT BUTTON_VOL_DOWN
#define PEGBOX_SELECT BUTTON_FUNC
-#define SAVE_TEXT "PLAY + FUNC"
#define QUIT_TEXT "REC + PLAY"
#define RESTART_TEXT "REC"
#define LVL_UP_TEXT "REW"
@@ -497,7 +493,6 @@ CONFIG_KEYPAD == MROBE500_PAD
#define PEGBOX_LEFT BUTTON_REW
#define PEGBOX_SELECT (BUTTON_ENTER | BUTTON_REL)
-#define SAVE_TEXT "Long ENTER"
#define QUIT_TEXT "Long MENU"
#define RESTART_TEXT "MENU"
#define LVL_UP_TEXT "PLAY"
@@ -515,7 +510,6 @@ CONFIG_KEYPAD == MROBE500_PAD
#define PEGBOX_LEFT BUTTON_LEFT
#define PEGBOX_SELECT BUTTON_SELECT
-#define SAVE_TEXT "PLAYPAUSE"
#define QUIT_TEXT "POWER"
#define RESTART_TEXT "BACK"
#define LVL_UP_TEXT "Vol+"
@@ -533,7 +527,6 @@ CONFIG_KEYPAD == MROBE500_PAD
#define PEGBOX_RIGHT BUTTON_RIGHT
#define PEGBOX_LEFT BUTTON_LEFT
-#define SAVE_TEXT "Vol+"
#define QUIT_TEXT "POWER"
#define RESTART_TEXT "Vol-"
#define LVL_UP_TEXT "NEXT"
@@ -551,7 +544,6 @@ CONFIG_KEYPAD == MROBE500_PAD
#define PEGBOX_RIGHT BUTTON_RIGHT
#define PEGBOX_LEFT BUTTON_LEFT
-#define SAVE_TEXT "PLAYPAUSE"
#define QUIT_TEXT "POWER"
#define RESTART_TEXT "BACK"
#define LVL_UP_TEXT "Vol+"
@@ -569,7 +561,6 @@ CONFIG_KEYPAD == MROBE500_PAD
#define PEGBOX_RIGHT BUTTON_RIGHT
#define PEGBOX_LEFT BUTTON_LEFT
-#define SAVE_TEXT "POWER + SELECT"
#define QUIT_TEXT "POWER"
#define RESTART_TEXT "POWER + LEFT"
#define LVL_UP_TEXT "POWER + UP"
@@ -587,7 +578,6 @@ CONFIG_KEYPAD == MROBE500_PAD
#define PEGBOX_RIGHT BUTTON_RIGHT
#define PEGBOX_LEFT BUTTON_LEFT
-#define SAVE_TEXT "PLAY"
#define QUIT_TEXT "POWER"
#define RESTART_TEXT "POWER + PREV"
#define LVL_UP_TEXT "NEXT"
@@ -603,11 +593,10 @@ CONFIG_KEYPAD == MROBE500_PAD
#define PEGBOX_SELECT BUTTON_PLAY
#define PEGBOX_RESTART BUTTON_BACK
-#define SAVE_TEXT "BACK+PLAY"
#define QUIT_TEXT "POWER"
#define RESTART_TEXT "BACK+POWER"
-#define LVL_UP_TEXT "BACK+RIGHT"
-#define LVL_DOWN_TEXT "BACK+LEFT"
+#define LVL_UP_TEXT ""
+#define LVL_DOWN_TEXT ""
#define SELECT_TEXT "PLAY"
diff --git a/apps/plugins/sudoku/sudoku.h b/apps/plugins/sudoku/sudoku.h
index ba476b4b55..11abc9c448 100644
--- a/apps/plugins/sudoku/sudoku.h
+++ b/apps/plugins/sudoku/sudoku.h
@@ -380,7 +380,6 @@
#define SUDOKU_BUTTON_POSSIBLE (BUTTON_POWER | BUTTON_SELECT)
#define SUDOKU_BUTTON_ALTTOGGLE BUTTON_SELECT
-
#elif CONFIG_KEYPAD == SONY_NWZ_PAD
#define SUDOKU_BUTTON_MENU BUTTON_BACK
#define SUDOKU_BUTTON_UP BUTTON_UP