diff options
| author | Bertrik Sikken <bertrik@sikken.nl> | 2008-11-24 18:47:49 +0000 |
|---|---|---|
| committer | Bertrik Sikken <bertrik@sikken.nl> | 2008-11-24 18:47:49 +0000 |
| commit | c16effb4bf55b4b786e5bf30d0bd51fd3c78da87 (patch) | |
| tree | ec4696d0ccb4b1296d65fe8f97853f626328a58f | |
| parent | 48b4e5213bef0c8b5c60ee7a69310f3c321c9e0e (diff) | |
Fixed Sansa clip keymap for CONTEXT_SETTINGS. Use same keymap for CONTEXT_SETTINGS_TIME.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19202 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | apps/keymaps/keymap-clip.c | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/apps/keymaps/keymap-clip.c b/apps/keymaps/keymap-clip.c index 4d080f9f0a..6bd22b2d38 100644 --- a/apps/keymaps/keymap-clip.c +++ b/apps/keymaps/keymap-clip.c @@ -91,10 +91,10 @@ static const struct button_mapping button_context_wps[] = { static const struct button_mapping button_context_settings[] = { { ACTION_STD_CANCEL, BUTTON_POWER, BUTTON_NONE }, - { ACTION_SETTINGS_INC, BUTTON_RIGHT, BUTTON_NONE }, - { ACTION_SETTINGS_INCREPEAT,BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_SETTINGS_DEC, BUTTON_LEFT, BUTTON_NONE }, - { ACTION_SETTINGS_DECREPEAT,BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_SETTINGS_INC, BUTTON_UP, BUTTON_NONE }, + { ACTION_SETTINGS_INCREPEAT,BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_SETTINGS_DEC, BUTTON_DOWN, BUTTON_NONE }, + { ACTION_SETTINGS_DECREPEAT,BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_STD_PREV, BUTTON_LEFT, BUTTON_NONE }, { ACTION_STD_PREVREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, @@ -183,15 +183,6 @@ static const struct button_mapping button_context_settings_right_is_inc[] = { LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD), }; /* button_context_settings_right_is_inc */ -static const struct button_mapping button_context_settings_time[] = { - { ACTION_STD_PREV, BUTTON_UP|BUTTON_REL, BUTTON_NONE }, - { ACTION_STD_PREVREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_STD_NEXT, BUTTON_DOWN|BUTTON_REL, BUTTON_NONE }, - { ACTION_STD_NEXTREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, - - LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS) -}; /* button_context_settings_time */ - static const struct button_mapping button_context_pitchscreen[] = { { ACTION_PS_INC_SMALL, BUTTON_RIGHT, BUTTON_NONE }, { ACTION_PS_INC_BIG, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, @@ -292,6 +283,7 @@ const struct button_mapping* get_context_mapping(int context) return button_context_tree; case CONTEXT_SETTINGS: + case CONTEXT_SETTINGS_TIME: return button_context_settings; case CONTEXT_CUSTOM|CONTEXT_SETTINGS: case CONTEXT_SETTINGS_COLOURCHOOSER: @@ -299,9 +291,6 @@ const struct button_mapping* get_context_mapping(int context) case CONTEXT_SETTINGS_RECTRIGGER: return button_context_settings_right_is_inc; - case CONTEXT_SETTINGS_TIME: - return button_context_settings_time; - case CONTEXT_YESNOSCREEN: return button_context_yesno; case CONTEXT_FM: |