summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--apps/keymaps/keymap-nwz.c6
-rw-r--r--docs/CREDITS1
2 files changed, 6 insertions, 1 deletions
diff --git a/apps/keymaps/keymap-nwz.c b/apps/keymaps/keymap-nwz.c
index 41edb74e69..66bdd1b0db 100644
--- a/apps/keymaps/keymap-nwz.c
+++ b/apps/keymaps/keymap-nwz.c
@@ -57,6 +57,7 @@ static const struct button_mapping button_context_wps[] = {
{ ACTION_WPS_QUICKSCREEN, BUTTON_POWER|BUTTON_REL, BUTTON_POWER },
{ ACTION_WPS_CONTEXT, BUTTON_POWER|BUTTON_REPEAT, BUTTON_NONE },
+ { ACTION_STD_KEYLOCK, BUTTON_POWER|BUTTON_BACK, BUTTON_NONE },
{ ACTION_WPS_SKIPNEXT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT },
{ ACTION_WPS_SEEKFWD, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
@@ -153,7 +154,10 @@ static const struct button_mapping button_context_radio[] = {
{ ACTION_FM_PLAY, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY },
{ ACTION_FM_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE },
- { ACTION_FM_EXIT, BUTTON_BACK, BUTTON_NONE },
+ { ACTION_STD_KEYLOCK, BUTTON_POWER|BUTTON_BACK, BUTTON_NONE },
+
+ { ACTION_FM_EXIT, BUTTON_BACK|BUTTON_REL, BUTTON_BACK },
+ { ACTION_FM_EXIT, BUTTON_BACK|BUTTON_REPEAT, BUTTON_NONE },
/* only compiled if there is a Volume UP button defined */
#ifdef BUTTON_VOL_UP
diff --git a/docs/CREDITS b/docs/CREDITS
index afd08ac879..3ea3234cbc 100644
--- a/docs/CREDITS
+++ b/docs/CREDITS
@@ -686,6 +686,7 @@ Martin Buck
Stefan Ott
David Chionne
Wilfried Winkler
+Johannes K├Ânig
The libmad team
The wavpack team