diff options
author | Rob Purchase <shotofadds@rockbox.org> | 2009-09-01 19:59:59 +0000 |
---|---|---|
committer | Rob Purchase <shotofadds@rockbox.org> | 2009-09-01 19:59:59 +0000 |
commit | 166606cea08761ce3d1acf6283db97ede444bd98 (patch) | |
tree | 3a07e11588df2bc08539657d295fbd0b551b42ae | |
parent | ffaf24674d6528606be7a62a1bc7db24d0793e88 (diff) | |
download | rockbox-166606cea08761ce3d1acf6283db97ede444bd98.tar.gz rockbox-166606cea08761ce3d1acf6283db97ede444bd98.zip |
D2: Move ACTION_WPS_STOP from the power button as it's too easy to hit by accident when disengaging the hold switch. Use a long press of the top-right touchscreen area instead.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22594 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/keymaps/keymap-cowond2.c | 2 | ||||
-rw-r--r-- | apps/keymaps/keymap-touchscreen.c | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/apps/keymaps/keymap-cowond2.c b/apps/keymaps/keymap-cowond2.c index fcb4d19c8e..0ec65484fc 100644 --- a/apps/keymaps/keymap-cowond2.c +++ b/apps/keymaps/keymap-cowond2.c | |||
@@ -63,8 +63,6 @@ static const struct button_mapping button_context_wps[] = { | |||
63 | { ACTION_WPS_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, | 63 | { ACTION_WPS_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, |
64 | { ACTION_WPS_CONTEXT, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, | 64 | { ACTION_WPS_CONTEXT, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, |
65 | 65 | ||
66 | { ACTION_WPS_STOP, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, | ||
67 | |||
68 | LAST_ITEM_IN_LIST | 66 | LAST_ITEM_IN_LIST |
69 | }; /* button_context_wps */ | 67 | }; /* button_context_wps */ |
70 | 68 | ||
diff --git a/apps/keymaps/keymap-touchscreen.c b/apps/keymaps/keymap-touchscreen.c index dfa4fde39c..eda92373d9 100644 --- a/apps/keymaps/keymap-touchscreen.c +++ b/apps/keymaps/keymap-touchscreen.c | |||
@@ -72,6 +72,7 @@ static const struct button_mapping button_context_standard[] = { | |||
72 | static const struct button_mapping button_context_wps[] = { | 72 | static const struct button_mapping button_context_wps[] = { |
73 | 73 | ||
74 | { ACTION_WPS_PLAY, BUTTON_TOPRIGHT|BUTTON_REL, BUTTON_TOPRIGHT }, | 74 | { ACTION_WPS_PLAY, BUTTON_TOPRIGHT|BUTTON_REL, BUTTON_TOPRIGHT }, |
75 | { ACTION_WPS_STOP, BUTTON_TOPRIGHT|BUTTON_REPEAT, BUTTON_TOPRIGHT }, | ||
75 | { ACTION_WPS_SKIPNEXT, BUTTON_MIDRIGHT|BUTTON_REL, BUTTON_MIDRIGHT }, | 76 | { ACTION_WPS_SKIPNEXT, BUTTON_MIDRIGHT|BUTTON_REL, BUTTON_MIDRIGHT }, |
76 | { ACTION_WPS_SKIPPREV, BUTTON_MIDLEFT|BUTTON_REL, BUTTON_MIDLEFT }, | 77 | { ACTION_WPS_SKIPPREV, BUTTON_MIDLEFT|BUTTON_REL, BUTTON_MIDLEFT }, |
77 | 78 | ||