diff options
author | Jeffrey Goode <jeffg7@gmail.com> | 2010-04-02 01:24:24 +0000 |
---|---|---|
committer | Jeffrey Goode <jeffg7@gmail.com> | 2010-04-02 01:24:24 +0000 |
commit | ce6ec7fef89dc2e41780836faa2e5c3dbe7eb8e4 (patch) | |
tree | f2f86d9c017c6aa84072018f106f9f9a4fd81bd1 /apps | |
parent | d6543b71afcceb028953b0fffcf5ed8f2942182e (diff) | |
download | rockbox-ce6ec7fef89dc2e41780836faa2e5c3dbe7eb8e4.tar.gz rockbox-ce6ec7fef89dc2e41780836faa2e5c3dbe7eb8e4.zip |
Switch on hotkey on several targets. Stole the WPS Show Track Info key for most of them. Made up a free key for the rest.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25433 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r-- | apps/keymaps/keymap-creativezv.c | 11 | ||||
-rw-r--r-- | apps/keymaps/keymap-creativezvm.c | 11 | ||||
-rw-r--r-- | apps/keymaps/keymap-gigabeat-s.c | 10 | ||||
-rw-r--r-- | apps/keymaps/keymap-gigabeat.c | 10 | ||||
-rw-r--r-- | apps/keymaps/keymap-hdd1630.c | 10 | ||||
-rw-r--r-- | apps/keymaps/keymap-hdd6330.c | 10 | ||||
-rw-r--r-- | apps/keymaps/keymap-ifp7xx.c | 2 | ||||
-rw-r--r-- | apps/keymaps/keymap-m200.c | 3 | ||||
-rw-r--r-- | apps/keymaps/keymap-meizu-m6sl.c | 10 | ||||
-rw-r--r-- | apps/keymaps/keymap-mini2440.c | 10 | ||||
-rw-r--r-- | apps/keymaps/keymap-mr100.c | 10 | ||||
-rw-r--r-- | apps/keymaps/keymap-sa9200.c | 8 | ||||
-rw-r--r-- | apps/keymaps/keymap-vibe500.c | 9 | ||||
-rw-r--r-- | apps/keymaps/keymap-yh8xx_yh9xx.c | 9 |
14 files changed, 28 insertions, 95 deletions
diff --git a/apps/keymaps/keymap-creativezv.c b/apps/keymaps/keymap-creativezv.c index 4108980720..ceacf29b0a 100644 --- a/apps/keymaps/keymap-creativezv.c +++ b/apps/keymaps/keymap-creativezv.c | |||
@@ -92,14 +92,10 @@ static const struct button_mapping button_context_wps[] = { | |||
92 | 92 | ||
93 | { ACTION_WPS_QUICKSCREEN, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, | 93 | { ACTION_WPS_QUICKSCREEN, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, |
94 | { ACTION_WPS_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, | 94 | { ACTION_WPS_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, |
95 | #ifdef HAVE_HOTKEY | ||
96 | { ACTION_WPS_HOTKEY, BUTTON_POWER, BUTTON_NONE }, | ||
97 | #else | ||
98 | { ACTION_WPS_VIEW_PLAYLIST, BUTTON_POWER, BUTTON_NONE }, | 95 | { ACTION_WPS_VIEW_PLAYLIST, BUTTON_POWER, BUTTON_NONE }, |
99 | #endif | ||
100 | { ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, | 96 | { ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, |
101 | 97 | ||
102 | { ACTION_WPS_ID3SCREEN, BUTTON_BACK|BUTTON_REL, BUTTON_NONE }, | 98 | { ACTION_WPS_HOTKEY, BUTTON_BACK|BUTTON_REL, BUTTON_NONE }, |
103 | { ACTION_WPS_BROWSE, BUTTON_SELECT|BUTTON_REL, BUTTON_BACK }, | 99 | { ACTION_WPS_BROWSE, BUTTON_SELECT|BUTTON_REL, BUTTON_BACK }, |
104 | LAST_ITEM_IN_LIST | 100 | LAST_ITEM_IN_LIST |
105 | }; /* button_context_wps */ | 101 | }; /* button_context_wps */ |
@@ -113,9 +109,8 @@ static const struct button_mapping button_context_tree[] = { | |||
113 | { ACTION_TREE_STOP, BUTTON_POWER, BUTTON_NONE }, | 109 | { ACTION_TREE_STOP, BUTTON_POWER, BUTTON_NONE }, |
114 | { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, | 110 | { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, |
115 | { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REPEAT, BUTTON_NONE }, | 111 | { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REPEAT, BUTTON_NONE }, |
116 | #ifdef HAVE_HOTKEY | 112 | { ACTION_TREE_HOTKEY, BUTTON_BACK|BUTTON_REL, BUTTON_NONE }, |
117 | // { ACTION_TREE_HOTKEY, BUTTON_NONE, BUTTON_NONE }, | 113 | |
118 | #endif | ||
119 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST) | 114 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST) |
120 | }; /* button_context_tree */ | 115 | }; /* button_context_tree */ |
121 | 116 | ||
diff --git a/apps/keymaps/keymap-creativezvm.c b/apps/keymaps/keymap-creativezvm.c index 5d1b25aa8d..b1ddb6320a 100644 --- a/apps/keymaps/keymap-creativezvm.c +++ b/apps/keymaps/keymap-creativezvm.c | |||
@@ -91,14 +91,10 @@ static const struct button_mapping button_context_wps[] = { | |||
91 | 91 | ||
92 | { ACTION_WPS_QUICKSCREEN, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, | 92 | { ACTION_WPS_QUICKSCREEN, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, |
93 | { ACTION_WPS_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, | 93 | { ACTION_WPS_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, |
94 | #ifdef HAVE_HOTKEY | ||
95 | { ACTION_WPS_HOTKEY, BUTTON_POWER, BUTTON_NONE }, | ||
96 | #else | ||
97 | { ACTION_WPS_VIEW_PLAYLIST, BUTTON_POWER, BUTTON_NONE }, | 94 | { ACTION_WPS_VIEW_PLAYLIST, BUTTON_POWER, BUTTON_NONE }, |
98 | #endif | ||
99 | { ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, | 95 | { ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, |
100 | 96 | ||
101 | { ACTION_WPS_ID3SCREEN, BUTTON_BACK|BUTTON_REL, BUTTON_NONE }, | 97 | { ACTION_WPS_HOTKEY, BUTTON_BACK|BUTTON_REL, BUTTON_NONE }, |
102 | { ACTION_WPS_BROWSE, BUTTON_SELECT|BUTTON_REL, BUTTON_BACK }, | 98 | { ACTION_WPS_BROWSE, BUTTON_SELECT|BUTTON_REL, BUTTON_BACK }, |
103 | LAST_ITEM_IN_LIST | 99 | LAST_ITEM_IN_LIST |
104 | }; /* button_context_wps */ | 100 | }; /* button_context_wps */ |
@@ -112,9 +108,8 @@ static const struct button_mapping button_context_tree[] = { | |||
112 | { ACTION_TREE_STOP, BUTTON_POWER, BUTTON_NONE }, | 108 | { ACTION_TREE_STOP, BUTTON_POWER, BUTTON_NONE }, |
113 | { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, | 109 | { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, |
114 | { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REPEAT, BUTTON_NONE }, | 110 | { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REPEAT, BUTTON_NONE }, |
115 | #ifdef HAVE_HOTKEY | 111 | { ACTION_TREE_HOTKEY, BUTTON_BACK|BUTTON_REL, BUTTON_NONE }, |
116 | // { ACTION_TREE_HOTKEY, BUTTON_NONE, BUTTON_NONE }, | 112 | |
117 | #endif | ||
118 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST) | 113 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST) |
119 | }; /* button_context_tree */ | 114 | }; /* button_context_tree */ |
120 | 115 | ||
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 */ |
diff --git a/apps/keymaps/keymap-gigabeat.c b/apps/keymaps/keymap-gigabeat.c index 61d0a593c8..b7d09eca7c 100644 --- a/apps/keymaps/keymap-gigabeat.c +++ b/apps/keymaps/keymap-gigabeat.c | |||
@@ -93,17 +93,13 @@ static const struct button_mapping button_context_wps[] = { | |||
93 | { ACTION_WPS_VOLUP, BUTTON_VOL_UP, BUTTON_NONE }, | 93 | { ACTION_WPS_VOLUP, BUTTON_VOL_UP, BUTTON_NONE }, |
94 | 94 | ||
95 | { ACTION_WPS_PITCHSCREEN, BUTTON_A|BUTTON_UP, BUTTON_A }, | 95 | { ACTION_WPS_PITCHSCREEN, BUTTON_A|BUTTON_UP, BUTTON_A }, |
96 | #ifdef HAVE_HOTKEY | ||
97 | { ACTION_WPS_HOTKEY, BUTTON_A|BUTTON_DOWN, BUTTON_NONE }, | ||
98 | #else | ||
99 | { ACTION_WPS_VIEW_PLAYLIST, BUTTON_A|BUTTON_DOWN, BUTTON_NONE }, | 96 | { ACTION_WPS_VIEW_PLAYLIST, BUTTON_A|BUTTON_DOWN, BUTTON_NONE }, |
100 | #endif | ||
101 | 97 | ||
102 | { ACTION_WPS_QUICKSCREEN, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, | 98 | { ACTION_WPS_QUICKSCREEN, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, |
103 | { ACTION_WPS_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, | 99 | { ACTION_WPS_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, |
104 | { ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, | 100 | { ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, |
105 | 101 | ||
106 | { ACTION_WPS_ID3SCREEN, BUTTON_A|BUTTON_MENU, BUTTON_NONE }, | 102 | { ACTION_WPS_HOTKEY, BUTTON_A|BUTTON_MENU, BUTTON_NONE }, |
107 | { ACTION_WPS_BROWSE, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, | 103 | { ACTION_WPS_BROWSE, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, |
108 | 104 | ||
109 | LAST_ITEM_IN_LIST | 105 | LAST_ITEM_IN_LIST |
@@ -131,9 +127,7 @@ static const struct button_mapping button_context_tree[] = { | |||
131 | { ACTION_TREE_STOP, BUTTON_POWER, BUTTON_NONE }, | 127 | { ACTION_TREE_STOP, BUTTON_POWER, BUTTON_NONE }, |
132 | { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, | 128 | { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, |
133 | { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REPEAT, BUTTON_NONE }, | 129 | { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REPEAT, BUTTON_NONE }, |
134 | #ifdef HAVE_HOTKEY | 130 | { ACTION_TREE_HOTKEY, BUTTON_A|BUTTON_MENU, BUTTON_NONE }, |
135 | // { ACTION_TREE_HOTKEY, BUTTON_NONE, BUTTON_NONE }, | ||
136 | #endif | ||
137 | 131 | ||
138 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST) | 132 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST) |
139 | }; /* button_context_tree */ | 133 | }; /* button_context_tree */ |
diff --git a/apps/keymaps/keymap-hdd1630.c b/apps/keymaps/keymap-hdd1630.c index b8de5eb84b..808b1cad72 100644 --- a/apps/keymaps/keymap-hdd1630.c +++ b/apps/keymaps/keymap-hdd1630.c | |||
@@ -93,17 +93,13 @@ static const struct button_mapping button_context_wps[] = { | |||
93 | { ACTION_WPS_VOLUP, BUTTON_VOL_UP, BUTTON_NONE }, | 93 | { ACTION_WPS_VOLUP, BUTTON_VOL_UP, BUTTON_NONE }, |
94 | 94 | ||
95 | { ACTION_WPS_PITCHSCREEN, BUTTON_VIEW|BUTTON_UP, BUTTON_VIEW }, | 95 | { ACTION_WPS_PITCHSCREEN, BUTTON_VIEW|BUTTON_UP, BUTTON_VIEW }, |
96 | #ifdef HAVE_HOTKEY | ||
97 | { ACTION_WPS_HOTKEY, BUTTON_VIEW|BUTTON_DOWN, BUTTON_VIEW }, | ||
98 | #else | ||
99 | { ACTION_WPS_VIEW_PLAYLIST, BUTTON_VIEW|BUTTON_DOWN, BUTTON_VIEW }, | 96 | { ACTION_WPS_VIEW_PLAYLIST, BUTTON_VIEW|BUTTON_DOWN, BUTTON_VIEW }, |
100 | #endif | ||
101 | 97 | ||
102 | { ACTION_WPS_QUICKSCREEN, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, | 98 | { ACTION_WPS_QUICKSCREEN, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, |
103 | { ACTION_WPS_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, | 99 | { ACTION_WPS_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, |
104 | { ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, | 100 | { ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, |
105 | 101 | ||
106 | { ACTION_WPS_ID3SCREEN, BUTTON_VIEW|BUTTON_MENU, BUTTON_NONE }, | 102 | { ACTION_WPS_HOTKEY, BUTTON_VIEW|BUTTON_MENU, BUTTON_NONE }, |
107 | { ACTION_WPS_BROWSE, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, | 103 | { ACTION_WPS_BROWSE, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, |
108 | 104 | ||
109 | LAST_ITEM_IN_LIST | 105 | LAST_ITEM_IN_LIST |
@@ -131,9 +127,7 @@ static const struct button_mapping button_context_tree[] = { | |||
131 | { ACTION_TREE_STOP, BUTTON_POWER, BUTTON_NONE }, | 127 | { ACTION_TREE_STOP, BUTTON_POWER, BUTTON_NONE }, |
132 | { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, | 128 | { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, |
133 | { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REPEAT, BUTTON_NONE }, | 129 | { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REPEAT, BUTTON_NONE }, |
134 | #ifdef HAVE_HOTKEY | 130 | { ACTION_TREE_HOTKEY, BUTTON_VIEW|BUTTON_MENU, BUTTON_NONE }, |
135 | // { ACTION_TREE_HOTKEY, BUTTON_NONE, BUTTON_NONE }, | ||
136 | #endif | ||
137 | 131 | ||
138 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST) | 132 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST) |
139 | }; /* button_context_tree */ | 133 | }; /* button_context_tree */ |
diff --git a/apps/keymaps/keymap-hdd6330.c b/apps/keymaps/keymap-hdd6330.c index b8de5eb84b..808b1cad72 100644 --- a/apps/keymaps/keymap-hdd6330.c +++ b/apps/keymaps/keymap-hdd6330.c | |||
@@ -93,17 +93,13 @@ static const struct button_mapping button_context_wps[] = { | |||
93 | { ACTION_WPS_VOLUP, BUTTON_VOL_UP, BUTTON_NONE }, | 93 | { ACTION_WPS_VOLUP, BUTTON_VOL_UP, BUTTON_NONE }, |
94 | 94 | ||
95 | { ACTION_WPS_PITCHSCREEN, BUTTON_VIEW|BUTTON_UP, BUTTON_VIEW }, | 95 | { ACTION_WPS_PITCHSCREEN, BUTTON_VIEW|BUTTON_UP, BUTTON_VIEW }, |
96 | #ifdef HAVE_HOTKEY | ||
97 | { ACTION_WPS_HOTKEY, BUTTON_VIEW|BUTTON_DOWN, BUTTON_VIEW }, | ||
98 | #else | ||
99 | { ACTION_WPS_VIEW_PLAYLIST, BUTTON_VIEW|BUTTON_DOWN, BUTTON_VIEW }, | 96 | { ACTION_WPS_VIEW_PLAYLIST, BUTTON_VIEW|BUTTON_DOWN, BUTTON_VIEW }, |
100 | #endif | ||
101 | 97 | ||
102 | { ACTION_WPS_QUICKSCREEN, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, | 98 | { ACTION_WPS_QUICKSCREEN, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, |
103 | { ACTION_WPS_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, | 99 | { ACTION_WPS_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, |
104 | { ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, | 100 | { ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, |
105 | 101 | ||
106 | { ACTION_WPS_ID3SCREEN, BUTTON_VIEW|BUTTON_MENU, BUTTON_NONE }, | 102 | { ACTION_WPS_HOTKEY, BUTTON_VIEW|BUTTON_MENU, BUTTON_NONE }, |
107 | { ACTION_WPS_BROWSE, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, | 103 | { ACTION_WPS_BROWSE, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, |
108 | 104 | ||
109 | LAST_ITEM_IN_LIST | 105 | LAST_ITEM_IN_LIST |
@@ -131,9 +127,7 @@ static const struct button_mapping button_context_tree[] = { | |||
131 | { ACTION_TREE_STOP, BUTTON_POWER, BUTTON_NONE }, | 127 | { ACTION_TREE_STOP, BUTTON_POWER, BUTTON_NONE }, |
132 | { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, | 128 | { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, |
133 | { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REPEAT, BUTTON_NONE }, | 129 | { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REPEAT, BUTTON_NONE }, |
134 | #ifdef HAVE_HOTKEY | 130 | { ACTION_TREE_HOTKEY, BUTTON_VIEW|BUTTON_MENU, BUTTON_NONE }, |
135 | // { ACTION_TREE_HOTKEY, BUTTON_NONE, BUTTON_NONE }, | ||
136 | #endif | ||
137 | 131 | ||
138 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST) | 132 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST) |
139 | }; /* button_context_tree */ | 133 | }; /* button_context_tree */ |
diff --git a/apps/keymaps/keymap-ifp7xx.c b/apps/keymaps/keymap-ifp7xx.c index 23e56e8b6e..c89b60e747 100644 --- a/apps/keymaps/keymap-ifp7xx.c +++ b/apps/keymaps/keymap-ifp7xx.c | |||
@@ -69,7 +69,7 @@ static const struct button_mapping button_context_wps[] = { | |||
69 | { ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, | 69 | { ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, |
70 | { ACTION_WPS_BROWSE, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, | 70 | { ACTION_WPS_BROWSE, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, |
71 | { ACTION_WPS_ABRESET, BUTTON_PLAY|BUTTON_SELECT, BUTTON_PLAY }, | 71 | { ACTION_WPS_ABRESET, BUTTON_PLAY|BUTTON_SELECT, BUTTON_PLAY }, |
72 | { ACTION_WPS_ID3SCREEN, BUTTON_PLAY|BUTTON_MODE, BUTTON_PLAY }, | 72 | { ACTION_WPS_HOTKEY, BUTTON_PLAY|BUTTON_MODE, BUTTON_PLAY }, |
73 | 73 | ||
74 | LAST_ITEM_IN_LIST | 74 | LAST_ITEM_IN_LIST |
75 | }; /* button_context_wps */ | 75 | }; /* button_context_wps */ |
diff --git a/apps/keymaps/keymap-m200.c b/apps/keymaps/keymap-m200.c index d199b208bb..652b4d80a6 100644 --- a/apps/keymaps/keymap-m200.c +++ b/apps/keymaps/keymap-m200.c | |||
@@ -78,7 +78,7 @@ static const struct button_mapping button_context_wps[] = { | |||
78 | { ACTION_WPS_MENU, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, | 78 | { ACTION_WPS_MENU, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, |
79 | { ACTION_WPS_BROWSE, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, | 79 | { ACTION_WPS_BROWSE, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, |
80 | { ACTION_WPS_PITCHSCREEN, BUTTON_SELECT|BUTTON_UP, BUTTON_SELECT }, | 80 | { ACTION_WPS_PITCHSCREEN, BUTTON_SELECT|BUTTON_UP, BUTTON_SELECT }, |
81 | { ACTION_WPS_ID3SCREEN, BUTTON_SELECT|BUTTON_DOWN, BUTTON_SELECT }, | 81 | { ACTION_WPS_HOTKEY, BUTTON_SELECT|BUTTON_DOWN, BUTTON_SELECT }, |
82 | { ACTION_WPS_CONTEXT, BUTTON_DOWN|BUTTON_REL, BUTTON_DOWN }, | 82 | { ACTION_WPS_CONTEXT, BUTTON_DOWN|BUTTON_REL, BUTTON_DOWN }, |
83 | { ACTION_WPS_QUICKSCREEN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_DOWN }, | 83 | { ACTION_WPS_QUICKSCREEN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_DOWN }, |
84 | /* { ACTION_WPS_REC, BUTTON_REC|BUTTON_REPEAT, BUTTON_NONE }, | 84 | /* { ACTION_WPS_REC, BUTTON_REC|BUTTON_REPEAT, BUTTON_NONE }, |
@@ -124,6 +124,7 @@ static const struct button_mapping button_context_list[] = { | |||
124 | static const struct button_mapping button_context_tree[] = { | 124 | static const struct button_mapping button_context_tree[] = { |
125 | // { ACTION_TREE_WPS, BUTTON_REC|BUTTON_VOLUP, BUTTON_REC }, | 125 | // { ACTION_TREE_WPS, BUTTON_REC|BUTTON_VOLUP, BUTTON_REC }, |
126 | // { ACTION_TREE_STOP, BUTTON_REC|BUTTON_VOLUP|BUTTON_REPEAT, BUTTON_REC|BUTTON_VOLUP }, | 126 | // { ACTION_TREE_STOP, BUTTON_REC|BUTTON_VOLUP|BUTTON_REPEAT, BUTTON_REC|BUTTON_VOLUP }, |
127 | { ACTION_TREE_HOTKEY, BUTTON_SELECT|BUTTON_DOWN, BUTTON_SELECT }, | ||
127 | 128 | ||
128 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST), | 129 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST), |
129 | }; /* button_context_tree */ | 130 | }; /* button_context_tree */ |
diff --git a/apps/keymaps/keymap-meizu-m6sl.c b/apps/keymaps/keymap-meizu-m6sl.c index c81b25729c..44a58e44d7 100644 --- a/apps/keymaps/keymap-meizu-m6sl.c +++ b/apps/keymaps/keymap-meizu-m6sl.c | |||
@@ -88,17 +88,13 @@ static const struct button_mapping button_context_wps[] = { | |||
88 | { ACTION_WPS_VOLUP, BUTTON_UP, BUTTON_NONE }, | 88 | { ACTION_WPS_VOLUP, BUTTON_UP, BUTTON_NONE }, |
89 | 89 | ||
90 | { ACTION_WPS_PITCHSCREEN, BUTTON_PLAY|BUTTON_UP, BUTTON_PLAY }, | 90 | { ACTION_WPS_PITCHSCREEN, BUTTON_PLAY|BUTTON_UP, BUTTON_PLAY }, |
91 | #ifdef HAVE_HOTKEY | ||
92 | { ACTION_WPS_HOTKEY, BUTTON_PLAY|BUTTON_DOWN, BUTTON_PLAY }, | ||
93 | #else | ||
94 | { ACTION_WPS_VIEW_PLAYLIST, BUTTON_PLAY|BUTTON_DOWN, BUTTON_PLAY }, | 91 | { ACTION_WPS_VIEW_PLAYLIST, BUTTON_PLAY|BUTTON_DOWN, BUTTON_PLAY }, |
95 | #endif | ||
96 | 92 | ||
97 | { ACTION_WPS_QUICKSCREEN, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, | 93 | { ACTION_WPS_QUICKSCREEN, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, |
98 | { ACTION_WPS_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, | 94 | { ACTION_WPS_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, |
99 | { ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, | 95 | { ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, |
100 | 96 | ||
101 | { ACTION_WPS_ID3SCREEN, BUTTON_PLAY|BUTTON_MENU, BUTTON_NONE }, | 97 | { ACTION_WPS_HOTKEY, BUTTON_PLAY|BUTTON_MENU, BUTTON_NONE }, |
102 | { ACTION_WPS_BROWSE, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, | 98 | { ACTION_WPS_BROWSE, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, |
103 | 99 | ||
104 | LAST_ITEM_IN_LIST | 100 | LAST_ITEM_IN_LIST |
@@ -118,9 +114,7 @@ static const struct button_mapping button_context_list[] = { | |||
118 | static const struct button_mapping button_context_tree[] = { | 114 | static const struct button_mapping button_context_tree[] = { |
119 | { ACTION_TREE_WPS, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, | 115 | { ACTION_TREE_WPS, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, |
120 | { ACTION_TREE_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE }, | 116 | { ACTION_TREE_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE }, |
121 | #ifdef HAVE_HOTKEY | 117 | { ACTION_TREE_HOTKEY, BUTTON_PLAY|BUTTON_MENU, BUTTON_NONE }, |
122 | // { ACTION_TREE_HOTKEY, BUTTON_NONE, BUTTON_NONE }, | ||
123 | #endif | ||
124 | 118 | ||
125 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST) | 119 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST) |
126 | }; /* button_context_tree */ | 120 | }; /* button_context_tree */ |
diff --git a/apps/keymaps/keymap-mini2440.c b/apps/keymaps/keymap-mini2440.c index db145aa480..65f6e748a9 100644 --- a/apps/keymaps/keymap-mini2440.c +++ b/apps/keymaps/keymap-mini2440.c | |||
@@ -95,17 +95,13 @@ static const struct button_mapping button_context_wps[] = { | |||
95 | { ACTION_WPS_VOLUP, BUTTON_VOL_UP, BUTTON_NONE }, | 95 | { ACTION_WPS_VOLUP, BUTTON_VOL_UP, BUTTON_NONE }, |
96 | 96 | ||
97 | { ACTION_WPS_PITCHSCREEN, BUTTON_A|BUTTON_UP, BUTTON_A }, | 97 | { ACTION_WPS_PITCHSCREEN, BUTTON_A|BUTTON_UP, BUTTON_A }, |
98 | #ifdef HAVE_HOTKEY | ||
99 | { ACTION_WPS_HOTKEY, BUTTON_A|BUTTON_DOWN, BUTTON_NONE }, | ||
100 | #else | ||
101 | { ACTION_WPS_VIEW_PLAYLIST, BUTTON_A|BUTTON_DOWN, BUTTON_NONE }, | 98 | { ACTION_WPS_VIEW_PLAYLIST, BUTTON_A|BUTTON_DOWN, BUTTON_NONE }, |
102 | #endif | ||
103 | 99 | ||
104 | { ACTION_WPS_QUICKSCREEN, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, | 100 | { ACTION_WPS_QUICKSCREEN, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, |
105 | { ACTION_WPS_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, | 101 | { ACTION_WPS_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, |
106 | { ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, | 102 | { ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, |
107 | 103 | ||
108 | { ACTION_WPS_ID3SCREEN, BUTTON_A|BUTTON_MENU, BUTTON_NONE }, | 104 | { ACTION_WPS_HOTKEY, BUTTON_A|BUTTON_MENU, BUTTON_NONE }, |
109 | { ACTION_WPS_BROWSE, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, | 105 | { ACTION_WPS_BROWSE, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, |
110 | 106 | ||
111 | LAST_ITEM_IN_LIST | 107 | LAST_ITEM_IN_LIST |
@@ -133,9 +129,7 @@ static const struct button_mapping button_context_tree[] = { | |||
133 | { ACTION_TREE_STOP, BUTTON_POWER, BUTTON_NONE }, | 129 | { ACTION_TREE_STOP, BUTTON_POWER, BUTTON_NONE }, |
134 | { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, | 130 | { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, |
135 | { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REPEAT, BUTTON_NONE }, | 131 | { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REPEAT, BUTTON_NONE }, |
136 | #ifdef HAVE_HOTKEY | 132 | { ACTION_TREE_HOTKEY, BUTTON_A|BUTTON_MENU, BUTTON_NONE }, |
137 | // { ACTION_TREE_HOTKEY, BUTTON_NONE, BUTTON_NONE }, | ||
138 | #endif | ||
139 | 133 | ||
140 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST) | 134 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST) |
141 | }; /* button_context_tree */ | 135 | }; /* button_context_tree */ |
diff --git a/apps/keymaps/keymap-mr100.c b/apps/keymaps/keymap-mr100.c index 5a13f31402..ad0f6eaea6 100644 --- a/apps/keymaps/keymap-mr100.c +++ b/apps/keymaps/keymap-mr100.c | |||
@@ -94,12 +94,8 @@ static const struct button_mapping button_context_wps[] = { | |||
94 | { ACTION_WPS_ABSETA_PREVDIR,BUTTON_DISPLAY|BUTTON_LEFT, BUTTON_NONE }, | 94 | { ACTION_WPS_ABSETA_PREVDIR,BUTTON_DISPLAY|BUTTON_LEFT, BUTTON_NONE }, |
95 | { ACTION_WPS_ABRESET, BUTTON_DISPLAY|BUTTON_SELECT, BUTTON_NONE }, | 95 | { ACTION_WPS_ABRESET, BUTTON_DISPLAY|BUTTON_SELECT, BUTTON_NONE }, |
96 | { ACTION_WPS_PITCHSCREEN, BUTTON_DISPLAY|BUTTON_UP, BUTTON_DISPLAY }, | 96 | { ACTION_WPS_PITCHSCREEN, BUTTON_DISPLAY|BUTTON_UP, BUTTON_DISPLAY }, |
97 | #ifdef HAVE_HOTKEY | ||
98 | { ACTION_WPS_HOTKEY, BUTTON_DISPLAY|BUTTON_DOWN, BUTTON_DISPLAY }, | ||
99 | #else | ||
100 | { ACTION_WPS_VIEW_PLAYLIST, BUTTON_DISPLAY|BUTTON_DOWN, BUTTON_DISPLAY }, | 97 | { ACTION_WPS_VIEW_PLAYLIST, BUTTON_DISPLAY|BUTTON_DOWN, BUTTON_DISPLAY }, |
101 | #endif | 98 | { ACTION_WPS_HOTKEY, BUTTON_DISPLAY|BUTTON_MENU, BUTTON_NONE }, |
102 | { ACTION_WPS_ID3SCREEN, BUTTON_DISPLAY|BUTTON_MENU, BUTTON_NONE }, | ||
103 | 99 | ||
104 | { ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, | 100 | { ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, |
105 | 101 | ||
@@ -123,9 +119,7 @@ static const struct button_mapping button_context_tree[] = { | |||
123 | { ACTION_TREE_STOP, BUTTON_POWER, BUTTON_NONE }, | 119 | { ACTION_TREE_STOP, BUTTON_POWER, BUTTON_NONE }, |
124 | { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, | 120 | { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, |
125 | { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REPEAT, BUTTON_NONE }, | 121 | { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REPEAT, BUTTON_NONE }, |
126 | #ifdef HAVE_HOTKEY | 122 | { ACTION_TREE_HOTKEY, BUTTON_DISPLAY|BUTTON_MENU, BUTTON_NONE }, |
127 | // { ACTION_TREE_HOTKEY, BUTTON_NONE, BUTTON_NONE }, | ||
128 | #endif | ||
129 | 123 | ||
130 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST) | 124 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST) |
131 | }; /* button_context_tree */ | 125 | }; /* button_context_tree */ |
diff --git a/apps/keymaps/keymap-sa9200.c b/apps/keymaps/keymap-sa9200.c index 3c98484b26..adee30ec10 100644 --- a/apps/keymaps/keymap-sa9200.c +++ b/apps/keymaps/keymap-sa9200.c | |||
@@ -100,11 +100,7 @@ static const struct button_mapping button_context_wps[] = { | |||
100 | { ACTION_WPS_CONTEXT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, | 100 | { ACTION_WPS_CONTEXT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, |
101 | { ACTION_WPS_QUICKSCREEN, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, | 101 | { ACTION_WPS_QUICKSCREEN, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, |
102 | { ACTION_WPS_PITCHSCREEN, BUTTON_NEXT|BUTTON_REPEAT, BUTTON_NONE }, | 102 | { ACTION_WPS_PITCHSCREEN, BUTTON_NEXT|BUTTON_REPEAT, BUTTON_NONE }, |
103 | #ifdef HAVE_HOTKEY | ||
104 | { ACTION_WPS_HOTKEY, BUTTON_NEXT|BUTTON_REL, BUTTON_NEXT }, | 103 | { ACTION_WPS_HOTKEY, BUTTON_NEXT|BUTTON_REL, BUTTON_NEXT }, |
105 | #else | ||
106 | { ACTION_WPS_VIEW_PLAYLIST, BUTTON_NEXT|BUTTON_REL, BUTTON_NEXT }, | ||
107 | #endif | ||
108 | { ACTION_WPS_ID3SCREEN, BUTTON_PREV|BUTTON_REPEAT, BUTTON_NONE }, | 104 | { ACTION_WPS_ID3SCREEN, BUTTON_PREV|BUTTON_REPEAT, BUTTON_NONE }, |
109 | 105 | ||
110 | LAST_ITEM_IN_LIST | 106 | LAST_ITEM_IN_LIST |
@@ -128,9 +124,7 @@ static const struct button_mapping button_context_list[] = { | |||
128 | static const struct button_mapping button_context_tree[] = { | 124 | static const struct button_mapping button_context_tree[] = { |
129 | { ACTION_TREE_WPS, BUTTON_PREV|BUTTON_REPEAT, BUTTON_NONE }, | 125 | { ACTION_TREE_WPS, BUTTON_PREV|BUTTON_REPEAT, BUTTON_NONE }, |
130 | { ACTION_TREE_STOP, BUTTON_NEXT|BUTTON_REPEAT, BUTTON_NONE }, | 126 | { ACTION_TREE_STOP, BUTTON_NEXT|BUTTON_REPEAT, BUTTON_NONE }, |
131 | #ifdef HAVE_HOTKEY | 127 | { ACTION_TREE_HOTKEY, BUTTON_NEXT|BUTTON_REL, BUTTON_NEXT }, |
132 | // { ACTION_TREE_HOTKEY, BUTTON_NONE, BUTTON_NONE }, | ||
133 | #endif | ||
134 | 128 | ||
135 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST) | 129 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST) |
136 | }; /* button_context_tree */ | 130 | }; /* button_context_tree */ |
diff --git a/apps/keymaps/keymap-vibe500.c b/apps/keymaps/keymap-vibe500.c index ae0756d1d3..d43aaa6385 100644 --- a/apps/keymaps/keymap-vibe500.c +++ b/apps/keymaps/keymap-vibe500.c | |||
@@ -66,11 +66,8 @@ static const struct button_mapping button_context_wps[] = { | |||
66 | { ACTION_WPS_VOLUP, BUTTON_UP, BUTTON_NONE }, | 66 | { ACTION_WPS_VOLUP, BUTTON_UP, BUTTON_NONE }, |
67 | { ACTION_WPS_BROWSE, BUTTON_OK|BUTTON_REL, BUTTON_OK }, | 67 | { ACTION_WPS_BROWSE, BUTTON_OK|BUTTON_REL, BUTTON_OK }, |
68 | { ACTION_WPS_CONTEXT, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, | 68 | { ACTION_WPS_CONTEXT, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, |
69 | #ifdef HAVE_HOTKEY | 69 | { ACTION_WPS_HOTKEY, BUTTON_REC|BUTTON_REL, BUTTON_REC }, |
70 | { ACTION_WPS_HOTKEY, BUTTON_CANCEL, BUTTON_NONE }, | ||
71 | #else | ||
72 | { ACTION_WPS_VIEW_PLAYLIST, BUTTON_CANCEL, BUTTON_NONE }, | 70 | { ACTION_WPS_VIEW_PLAYLIST, BUTTON_CANCEL, BUTTON_NONE }, |
73 | #endif | ||
74 | { ACTION_WPS_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, | 71 | { ACTION_WPS_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, |
75 | { ACTION_WPS_QUICKSCREEN, BUTTON_OK|BUTTON_REPEAT, BUTTON_OK }, | 72 | { ACTION_WPS_QUICKSCREEN, BUTTON_OK|BUTTON_REPEAT, BUTTON_OK }, |
76 | 73 | ||
@@ -80,9 +77,7 @@ static const struct button_mapping button_context_wps[] = { | |||
80 | static const struct button_mapping button_context_tree[] = { | 77 | static const struct button_mapping button_context_tree[] = { |
81 | { ACTION_TREE_WPS, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, | 78 | { ACTION_TREE_WPS, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, |
82 | { ACTION_TREE_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, | 79 | { ACTION_TREE_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, |
83 | #ifdef HAVE_HOTKEY | 80 | { ACTION_TREE_HOTKEY, BUTTON_REC|BUTTON_REL, BUTTON_REC }, |
84 | // { ACTION_TREE_HOTKEY, BUTTON_NONE, BUTTON_NONE }, | ||
85 | #endif | ||
86 | 81 | ||
87 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | 82 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
88 | }; /* button_context_tree */ | 83 | }; /* button_context_tree */ |
diff --git a/apps/keymaps/keymap-yh8xx_yh9xx.c b/apps/keymaps/keymap-yh8xx_yh9xx.c index c64263d809..0bc197b9de 100644 --- a/apps/keymaps/keymap-yh8xx_yh9xx.c +++ b/apps/keymaps/keymap-yh8xx_yh9xx.c | |||
@@ -96,11 +96,8 @@ static const struct button_mapping button_context_wps[] = { | |||
96 | { ACTION_WPS_QUICKSCREEN, BUTTON_LEFT|BUTTON_DOWN|BUTTON_REPEAT, | 96 | { ACTION_WPS_QUICKSCREEN, BUTTON_LEFT|BUTTON_DOWN|BUTTON_REPEAT, |
97 | BUTTON_LEFT|BUTTON_DOWN|BUTTON_REPEAT }, | 97 | BUTTON_LEFT|BUTTON_DOWN|BUTTON_REPEAT }, |
98 | 98 | ||
99 | #ifdef HAVE_HOTKEY | 99 | { ACTION_WPS_HOTKEY, BUTTON_REC|BUTTON_REL, BUTTON_REC }, |
100 | { ACTION_WPS_HOTKEY, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT }, | ||
101 | #else | ||
102 | { ACTION_WPS_VIEW_PLAYLIST, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT }, | 100 | { ACTION_WPS_VIEW_PLAYLIST, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT }, |
103 | #endif | ||
104 | { ACTION_WPS_REC, BUTTON_REC|BUTTON_REPEAT, BUTTON_NONE }, | 101 | { ACTION_WPS_REC, BUTTON_REC|BUTTON_REPEAT, BUTTON_NONE }, |
105 | 102 | ||
106 | LAST_ITEM_IN_LIST | 103 | LAST_ITEM_IN_LIST |
@@ -121,9 +118,7 @@ static const struct button_mapping button_context_list[] = { | |||
121 | static const struct button_mapping button_context_tree[] = { | 118 | static const struct button_mapping button_context_tree[] = { |
122 | { ACTION_TREE_WPS, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, | 119 | { ACTION_TREE_WPS, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, |
123 | { ACTION_TREE_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, | 120 | { ACTION_TREE_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, |
124 | #ifdef HAVE_HOTKEY | 121 | { ACTION_TREE_HOTKEY, BUTTON_REC|BUTTON_REL, BUTTON_REC }, |
125 | // { ACTION_TREE_HOTKEY, BUTTON_NONE, BUTTON_NONE }, | ||
126 | #endif | ||
127 | 122 | ||
128 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST) | 123 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST) |
129 | }; /* button_context_tree */ | 124 | }; /* button_context_tree */ |