diff options
| author | Rafaël Carré <rafael.carre@gmail.com> | 2010-06-18 20:03:39 +0000 |
|---|---|---|
| committer | Rafaël Carré <rafael.carre@gmail.com> | 2010-06-18 20:03:39 +0000 |
| commit | 94f18b1f9f84115850082d57a95997f79819287f (patch) | |
| tree | d40c3827d94143442c1871d9f25ba87b57cb9406 | |
| parent | 3a0c6fb34b9957f6f6e78d62e151d5a155542f4c (diff) | |
| download | rockbox-94f18b1f9f84115850082d57a95997f79819287f.tar.gz rockbox-94f18b1f9f84115850082d57a95997f79819287f.zip | |
clip+ keymap: revert r26396
software hold is now on home+select and quickscreen on long home like on
other clips
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26938 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | apps/keymaps/keymap-clip.c | 6 | ||||
| -rw-r--r-- | manual/rockbox_interface/wps.tex | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/apps/keymaps/keymap-clip.c b/apps/keymaps/keymap-clip.c index d871ea4f6c..a8766b5643 100644 --- a/apps/keymaps/keymap-clip.c +++ b/apps/keymaps/keymap-clip.c @@ -77,11 +77,7 @@ static const struct button_mapping button_context_wps[] = { { ACTION_WPS_BROWSE, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, { ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, -#ifndef HAS_BUTTON_HOLD /* Clip+ */ - { ACTION_WPS_QUICKSCREEN, BUTTON_HOME|BUTTON_SELECT, BUTTON_HOME }, -#else { ACTION_WPS_QUICKSCREEN, BUTTON_HOME|BUTTON_REPEAT, BUTTON_HOME }, -#endif { ACTION_WPS_MENU, BUTTON_HOME|BUTTON_REL, BUTTON_HOME }, { ACTION_WPS_PITCHSCREEN, BUTTON_SELECT|BUTTON_UP, BUTTON_SELECT }, @@ -93,7 +89,7 @@ static const struct button_mapping button_context_wps[] = { #endif #ifndef HAS_BUTTON_HOLD /* Clip+ */ - { ACTION_STD_KEYLOCK, BUTTON_HOME|BUTTON_REPEAT, BUTTON_HOME }, + { ACTION_STD_KEYLOCK, BUTTON_HOME|BUTTON_SELECT, BUTTON_NONE }, #endif /* HAS_BUTTON_HOLD */ LAST_ITEM_IN_LIST diff --git a/manual/rockbox_interface/wps.tex b/manual/rockbox_interface/wps.tex index 67b2a981df..cdfde8d3fc 100644 --- a/manual/rockbox_interface/wps.tex +++ b/manual/rockbox_interface/wps.tex @@ -110,7 +110,7 @@ your WPS (While Playing Screen). \opt{RECORDER_PAD}{\ButtonFOne+\ButtonDown} \opt{PLAYER_PAD}{\ButtonMenu+\ButtonStop} \opt{ONDIO_PAD}{\ButtonMenu+\ButtonDown} - \opt{SANSA_CLIP_PAD}{Long \ButtonHome} + \opt{SANSA_CLIP_PAD}{\ButtonHome+\ButtonSelect} & Key lock on/off.\\ }% %These actions need definitions for the other targets |