Improved keymap for the Gigabeat S.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17332 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 10 insertions, 3 deletions

diff --git a/apps/keymaps/keymap-gigabeat-s.c b/apps/keymaps/keymap-gigabeat-s.c
index 42d5b4640a..187eb36414 100644
--- a/apps/keymaps/keymap-gigabeat-s.c
+++ b/apps/keymaps/keymap-gigabeat-s.c
@@ -52,6 +52,7 @@ static const struct button_mapping button_context_standard[]  = {
 
     { ACTION_STD_CANCEL,        BUTTON_LEFT,                BUTTON_NONE },
     { ACTION_STD_CANCEL,        BUTTON_POWER,               BUTTON_NONE },
+    { ACTION_STD_CANCEL,        BUTTON_BACK,                BUTTON_NONE },
 
     { ACTION_STD_CONTEXT,       BUTTON_SELECT|BUTTON_REPEAT,BUTTON_SELECT },
 
@@ -66,16 +67,22 @@ static const struct button_mapping button_context_standard[]  = {
 
 
 static const struct button_mapping button_context_wps[]  = {
-    { ACTION_WPS_PLAY,          BUTTON_SELECT|BUTTON_REL,       BUTTON_SELECT },
-    { ACTION_WPS_STOP,          BUTTON_PLAY|BUTTON_REPEAT,      BUTTON_NONE },
+    { ACTION_WPS_PLAY,          BUTTON_PLAY|BUTTON_REL,         BUTTON_PLAY },
+    { ACTION_WPS_STOP,          BUTTON_POWER|BUTTON_REL,        BUTTON_POWER },
 
     { ACTION_WPS_SKIPNEXT,      BUTTON_RIGHT|BUTTON_REL,        BUTTON_RIGHT },
+    { ACTION_WPS_SKIPNEXT,      BUTTON_NEXT|BUTTON_REL,         BUTTON_NEXT },
     { ACTION_WPS_SKIPPREV,      BUTTON_LEFT|BUTTON_REL,         BUTTON_LEFT },
+    { ACTION_WPS_SKIPPREV,      BUTTON_PREV|BUTTON_REL,         BUTTON_PREV },
 
     { ACTION_WPS_SEEKBACK,      BUTTON_LEFT|BUTTON_REPEAT,      BUTTON_NONE },
+    { ACTION_WPS_SEEKBACK,      BUTTON_PREV|BUTTON_REPEAT,      BUTTON_NONE },
     { ACTION_WPS_SEEKFWD,       BUTTON_RIGHT|BUTTON_REPEAT,     BUTTON_NONE },
+    { ACTION_WPS_SEEKFWD,       BUTTON_NEXT|BUTTON_REPEAT,      BUTTON_NONE },
     { ACTION_WPS_STOPSEEK,      BUTTON_LEFT|BUTTON_REL,         BUTTON_LEFT|BUTTON_REPEAT },
+    { ACTION_WPS_STOPSEEK,      BUTTON_PREV|BUTTON_REL,         BUTTON_PREV|BUTTON_REPEAT },
     { ACTION_WPS_STOPSEEK,      BUTTON_RIGHT|BUTTON_REL,        BUTTON_RIGHT|BUTTON_REPEAT },
+    { ACTION_WPS_STOPSEEK,      BUTTON_NEXT|BUTTON_REL,         BUTTON_NEXT|BUTTON_REPEAT },
 
     { ACTION_WPS_ABSETB_NEXTDIR,       BUTTON_BACK|BUTTON_RIGHT,         BUTTON_BACK },
     { ACTION_WPS_ABSETA_PREVDIR,       BUTTON_BACK|BUTTON_LEFT,          BUTTON_BACK },
@@ -98,7 +105,7 @@ static const struct button_mapping button_context_wps[]  = {
     { ACTION_WPS_CONTEXT,       BUTTON_SELECT|BUTTON_REPEAT,    BUTTON_SELECT },
 
     { ACTION_WPS_ID3SCREEN,     BUTTON_BACK|BUTTON_MENU,        BUTTON_NONE },
-    { ACTION_WPS_BROWSE,        BUTTON_BACK|BUTTON_REL,         BUTTON_BACK },
+    { ACTION_WPS_BROWSE,        BUTTON_SELECT|BUTTON_REL,       BUTTON_SELECT },
 
     LAST_ITEM_IN_LIST
 }; /* button_context_wps */