summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJens Arnold <amiconn@rockbox.org>2007-03-18 14:19:18 +0000
committerJens Arnold <amiconn@rockbox.org>2007-03-18 14:19:18 +0000
commit2cf98689cfa101e870670bda6e19ef1ccb790687 (patch)
tree3b49e2361a5c156d0770b121098a4e600f5c92a9
parentf34495deca5ed67bacde1289a1d541409cb29ea3 (diff)
downloadrockbox-2cf98689cfa101e870670bda6e19ef1ccb790687.tar.gz
rockbox-2cf98689cfa101e870670bda6e19ef1ccb790687.tar.bz2
rockbox-2cf98689cfa101e870670bda6e19ef1ccb790687.zip
Player: Improve usaibiliy of wps volume adjustment in wps, and allow ON as 'ok' in standard context (fixes charging screen).
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12833 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/keymaps/keymap-player.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/apps/keymaps/keymap-player.c b/apps/keymaps/keymap-player.c
index 80cdedfc3c..af28bc9e48 100644
--- a/apps/keymaps/keymap-player.c
+++ b/apps/keymaps/keymap-player.c
@@ -33,6 +33,7 @@ static const struct button_mapping button_context_standard[] = {
{ ACTION_STD_CONTEXT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY },
{ ACTION_STD_CANCEL, BUTTON_STOP, BUTTON_NONE },
+ { ACTION_STD_OK, BUTTON_ON, BUTTON_NONE },
{ ACTION_STD_OK, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY },
{ ACTION_STD_MENU, BUTTON_MENU, BUTTON_NONE },
@@ -49,9 +50,9 @@ static const struct button_mapping button_context_wps[] = {
{ ACTION_WPS_STOPSEEK, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT|BUTTON_REPEAT },
{ ACTION_WPS_STOP, BUTTON_STOP, BUTTON_NONE },
- { ACTION_WPS_VOLDOWN, BUTTON_MENU|BUTTON_LEFT, BUTTON_MENU },
+ { ACTION_WPS_VOLDOWN, BUTTON_MENU|BUTTON_LEFT, BUTTON_NONE },
{ ACTION_WPS_VOLDOWN, BUTTON_MENU|BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
- { ACTION_WPS_VOLUP, BUTTON_MENU|BUTTON_RIGHT, BUTTON_MENU },
+ { ACTION_WPS_VOLUP, BUTTON_MENU|BUTTON_RIGHT, BUTTON_NONE },
{ ACTION_WPS_VOLUP, BUTTON_MENU|BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_WPS_BROWSE, BUTTON_ON|BUTTON_REL, BUTTON_ON },
@@ -59,7 +60,7 @@ static const struct button_mapping button_context_wps[] = {
{ ACTION_WPS_CONTEXT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY },
{ ACTION_WPS_ID3SCREEN, BUTTON_MENU|BUTTON_ON, BUTTON_NONE },
{ ACTION_STD_KEYLOCK, BUTTON_MENU|BUTTON_STOP, BUTTON_NONE },
-
+
LAST_ITEM_IN_LIST
};