diff options
Diffstat (limited to 'apps/keymaps/keymap-gigabeat-s.c')
-rw-r--r-- | apps/keymaps/keymap-gigabeat-s.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/apps/keymaps/keymap-gigabeat-s.c b/apps/keymaps/keymap-gigabeat-s.c index 343d6b4f9c..5f16d1b292 100644 --- a/apps/keymaps/keymap-gigabeat-s.c +++ b/apps/keymaps/keymap-gigabeat-s.c | |||
@@ -100,17 +100,13 @@ static const struct button_mapping button_context_wps[] = { | |||
100 | { ACTION_WPS_VOLUP, BUTTON_VOL_UP, BUTTON_NONE }, | 100 | { ACTION_WPS_VOLUP, BUTTON_VOL_UP, BUTTON_NONE }, |
101 | 101 | ||
102 | { ACTION_WPS_PITCHSCREEN, BUTTON_BACK|BUTTON_UP, BUTTON_BACK }, | 102 | { ACTION_WPS_PITCHSCREEN, BUTTON_BACK|BUTTON_UP, BUTTON_BACK }, |
103 | #ifdef HAVE_HOTKEY | ||
104 | { ACTION_WPS_HOTKEY, BUTTON_BACK|BUTTON_DOWN, BUTTON_NONE }, | ||
105 | #else | ||
106 | { ACTION_WPS_VIEW_PLAYLIST, BUTTON_BACK|BUTTON_DOWN, BUTTON_NONE }, | 103 | { ACTION_WPS_VIEW_PLAYLIST, BUTTON_BACK|BUTTON_DOWN, BUTTON_NONE }, |
107 | #endif | ||
108 | 104 | ||
109 | { ACTION_WPS_QUICKSCREEN, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, | 105 | { ACTION_WPS_QUICKSCREEN, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, |
110 | { ACTION_WPS_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, | 106 | { ACTION_WPS_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, |
111 | { ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, | 107 | { ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, |
112 | 108 | ||
113 | { ACTION_WPS_ID3SCREEN, BUTTON_BACK|BUTTON_MENU, BUTTON_NONE }, | 109 | { ACTION_WPS_HOTKEY, BUTTON_BACK|BUTTON_MENU, BUTTON_NONE }, |
114 | { ACTION_WPS_BROWSE, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, | 110 | { ACTION_WPS_BROWSE, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, |
115 | 111 | ||
116 | LAST_ITEM_IN_LIST | 112 | LAST_ITEM_IN_LIST |
@@ -138,9 +134,7 @@ static const struct button_mapping button_context_tree[] = { | |||
138 | { ACTION_TREE_STOP, BUTTON_POWER, BUTTON_NONE }, | 134 | { ACTION_TREE_STOP, BUTTON_POWER, BUTTON_NONE }, |
139 | { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, | 135 | { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, |
140 | { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REPEAT, BUTTON_NONE }, | 136 | { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REPEAT, BUTTON_NONE }, |
141 | #ifdef HAVE_HOTKEY | 137 | { ACTION_TREE_HOTKEY,BUTTON_BACK|BUTTON_MENU, BUTTON_NONE }, |
142 | // { ACTION_TREE_HOTKEY,BUTTON_NONE, BUTTON_NONE }, | ||
143 | #endif | ||
144 | 138 | ||
145 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST) | 139 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST) |
146 | }; /* button_context_tree */ | 140 | }; /* button_context_tree */ |