diff options
author | Jeffrey Goode <jeffg7@gmail.com> | 2010-04-01 03:14:44 +0000 |
---|---|---|
committer | Jeffrey Goode <jeffg7@gmail.com> | 2010-04-01 03:14:44 +0000 |
commit | d5e6bc7a8c413218ec1372fd54157e9639ab67b4 (patch) | |
tree | 2be93c700ef9c5e8f85cc7dbbfab7f9f842c92f0 /apps/keymaps | |
parent | 39e78993f317349dacfc4e8d1abb703117636696 (diff) | |
download | rockbox-d5e6bc7a8c413218ec1372fd54157e9639ab67b4.tar.gz rockbox-d5e6bc7a8c413218ec1372fd54157e9639ab67b4.zip |
FS#11081 - Hotkey patch. Many targets supported, but some keymaps need work before they can be switched on
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25414 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/keymaps')
26 files changed, 127 insertions, 11 deletions
diff --git a/apps/keymaps/keymap-av300.c b/apps/keymaps/keymap-av300.c index 7d66921c3a..b80219f232 100644 --- a/apps/keymaps/keymap-av300.c +++ b/apps/keymaps/keymap-av300.c | |||
@@ -75,7 +75,7 @@ static const struct button_mapping button_context_wps[] = { | |||
75 | { ACTION_WPS_MENU, BUTTON_F1|BUTTON_REL, BUTTON_F1 }, | 75 | { ACTION_WPS_MENU, BUTTON_F1|BUTTON_REL, BUTTON_F1 }, |
76 | { ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT,BUTTON_SELECT }, | 76 | { ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT,BUTTON_SELECT }, |
77 | { ACTION_WPS_QUICKSCREEN, BUTTON_F2|BUTTON_REPEAT, BUTTON_NONE }, | 77 | { ACTION_WPS_QUICKSCREEN, BUTTON_F2|BUTTON_REPEAT, BUTTON_NONE }, |
78 | { ACTION_WPS_VIEW_PLAYLIST, BUTTON_F2|BUTTON_REL, BUTTON_F2 }, | 78 | { ACTION_WPS_HOTKEY, BUTTON_F2|BUTTON_REL, BUTTON_F2 }, |
79 | { ACTION_WPS_BROWSE, BUTTON_ON|BUTTON_REL, BUTTON_ON }, | 79 | { ACTION_WPS_BROWSE, BUTTON_ON|BUTTON_REL, BUTTON_ON }, |
80 | { ACTION_WPS_ID3SCREEN, BUTTON_F1|BUTTON_ON, BUTTON_NONE }, | 80 | { ACTION_WPS_ID3SCREEN, BUTTON_F1|BUTTON_ON, BUTTON_NONE }, |
81 | { ACTION_WPS_PITCHSCREEN, BUTTON_ON|BUTTON_UP, BUTTON_ON }, | 81 | { ACTION_WPS_PITCHSCREEN, BUTTON_ON|BUTTON_UP, BUTTON_ON }, |
@@ -106,6 +106,7 @@ static const struct button_mapping button_context_settings[] = { | |||
106 | static const struct button_mapping button_context_tree[] = { | 106 | static const struct button_mapping button_context_tree[] = { |
107 | { ACTION_TREE_WPS, BUTTON_ON|BUTTON_REL, BUTTON_ON }, | 107 | { ACTION_TREE_WPS, BUTTON_ON|BUTTON_REL, BUTTON_ON }, |
108 | { ACTION_TREE_STOP, BUTTON_OFF, BUTTON_NONE }, | 108 | { ACTION_TREE_STOP, BUTTON_OFF, BUTTON_NONE }, |
109 | { ACTION_TREE_HOTKEY, BUTTON_F2|BUTTON_REL, BUTTON_F2 }, | ||
109 | { ACTION_NONE, BUTTON_ON, BUTTON_NONE }, | 110 | { ACTION_NONE, BUTTON_ON, BUTTON_NONE }, |
110 | { ACTION_LISTTREE_PGUP, BUTTON_ON|BUTTON_UP, BUTTON_ON }, | 111 | { ACTION_LISTTREE_PGUP, BUTTON_ON|BUTTON_UP, BUTTON_ON }, |
111 | { ACTION_LISTTREE_PGUP, BUTTON_UP|BUTTON_REL, BUTTON_ON|BUTTON_UP }, | 112 | { ACTION_LISTTREE_PGUP, BUTTON_UP|BUTTON_REL, BUTTON_ON|BUTTON_UP }, |
diff --git a/apps/keymaps/keymap-c100.c b/apps/keymaps/keymap-c100.c index 3312da3e1d..58f1f5f42b 100644 --- a/apps/keymaps/keymap-c100.c +++ b/apps/keymaps/keymap-c100.c | |||
@@ -69,7 +69,7 @@ static const struct button_mapping button_context_wps[] = { | |||
69 | { ACTION_WPS_PITCHSCREEN, BUTTON_SELECT|BUTTON_VOLUP, BUTTON_SELECT }, | 69 | { ACTION_WPS_PITCHSCREEN, BUTTON_SELECT|BUTTON_VOLUP, BUTTON_SELECT }, |
70 | { ACTION_WPS_ID3SCREEN, BUTTON_SELECT|BUTTON_VOLDOWN, BUTTON_SELECT }, | 70 | { ACTION_WPS_ID3SCREEN, BUTTON_SELECT|BUTTON_VOLDOWN, BUTTON_SELECT }, |
71 | { ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, | 71 | { ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, |
72 | { ACTION_WPS_VIEW_PLAYLIST, BUTTON_SELECT|BUTTON_DOWN, BUTTON_NONE }, | 72 | { ACTION_WPS_HOTKEY, BUTTON_SELECT|BUTTON_DOWN, BUTTON_NONE }, |
73 | { ACTION_WPS_QUICKSCREEN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_DOWN }, | 73 | { ACTION_WPS_QUICKSCREEN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_DOWN }, |
74 | 74 | ||
75 | LAST_ITEM_IN_LIST | 75 | LAST_ITEM_IN_LIST |
@@ -104,6 +104,7 @@ static const struct button_mapping button_context_list[] = { | |||
104 | static const struct button_mapping button_context_tree[] = { | 104 | static const struct button_mapping button_context_tree[] = { |
105 | { ACTION_TREE_WPS, BUTTON_UP|BUTTON_REL, BUTTON_UP }, | 105 | { ACTION_TREE_WPS, BUTTON_UP|BUTTON_REL, BUTTON_UP }, |
106 | { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, | 106 | { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, |
107 | { ACTION_TREE_HOTKEY, BUTTON_SELECT|BUTTON_DOWN, BUTTON_NONE }, | ||
107 | 108 | ||
108 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST), | 109 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST), |
109 | }; /* button_context_tree */ | 110 | }; /* button_context_tree */ |
diff --git a/apps/keymaps/keymap-c200.c b/apps/keymaps/keymap-c200.c index 487a2db1a7..f19440019c 100644 --- a/apps/keymaps/keymap-c200.c +++ b/apps/keymaps/keymap-c200.c | |||
@@ -81,7 +81,7 @@ static const struct button_mapping button_context_wps[] = { | |||
81 | { ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, | 81 | { ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, |
82 | { ACTION_WPS_QUICKSCREEN, BUTTON_DOWN, BUTTON_NONE }, | 82 | { ACTION_WPS_QUICKSCREEN, BUTTON_DOWN, BUTTON_NONE }, |
83 | { ACTION_WPS_REC, BUTTON_REC|BUTTON_REPEAT, BUTTON_NONE }, | 83 | { ACTION_WPS_REC, BUTTON_REC|BUTTON_REPEAT, BUTTON_NONE }, |
84 | { ACTION_WPS_VIEW_PLAYLIST, BUTTON_REC|BUTTON_REL, BUTTON_REC }, | 84 | { ACTION_WPS_HOTKEY, BUTTON_REC|BUTTON_REL, BUTTON_REC }, |
85 | 85 | ||
86 | LAST_ITEM_IN_LIST | 86 | LAST_ITEM_IN_LIST |
87 | }; /* button_context_wps */ | 87 | }; /* button_context_wps */ |
@@ -123,6 +123,7 @@ static const struct button_mapping button_context_list[] = { | |||
123 | 123 | ||
124 | static const struct button_mapping button_context_tree[] = { | 124 | static const struct button_mapping button_context_tree[] = { |
125 | { ACTION_TREE_WPS, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_RIGHT }, | 125 | { ACTION_TREE_WPS, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_RIGHT }, |
126 | { ACTION_TREE_HOTKEY, BUTTON_REC|BUTTON_REL, BUTTON_REC }, | ||
126 | 127 | ||
127 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST), | 128 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST), |
128 | }; /* button_context_tree */ | 129 | }; /* button_context_tree */ |
diff --git a/apps/keymaps/keymap-clip.c b/apps/keymaps/keymap-clip.c index afef805681..942968b20f 100644 --- a/apps/keymaps/keymap-clip.c +++ b/apps/keymaps/keymap-clip.c | |||
@@ -82,7 +82,11 @@ static const struct button_mapping button_context_wps[] = { | |||
82 | 82 | ||
83 | { ACTION_WPS_PITCHSCREEN, BUTTON_SELECT|BUTTON_UP, BUTTON_SELECT }, | 83 | { ACTION_WPS_PITCHSCREEN, BUTTON_SELECT|BUTTON_UP, BUTTON_SELECT }, |
84 | { ACTION_WPS_ID3SCREEN, BUTTON_SELECT|BUTTON_DOWN, BUTTON_SELECT }, | 84 | { ACTION_WPS_ID3SCREEN, BUTTON_SELECT|BUTTON_DOWN, BUTTON_SELECT }, |
85 | #ifdef HAVE_HOTKEY | ||
86 | { ACTION_WPS_HOTKEY, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | ||
87 | #else | ||
85 | { ACTION_WPS_VIEW_PLAYLIST, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 88 | { ACTION_WPS_VIEW_PLAYLIST, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
89 | #endif | ||
86 | 90 | ||
87 | #ifndef HAS_BUTTON_HOLD /* Clip+ */ | 91 | #ifndef HAS_BUTTON_HOLD /* Clip+ */ |
88 | { ACTION_STD_KEYLOCK, BUTTON_HOME|BUTTON_SELECT, BUTTON_NONE }, | 92 | { ACTION_STD_KEYLOCK, BUTTON_HOME|BUTTON_SELECT, BUTTON_NONE }, |
@@ -131,6 +135,9 @@ static const struct button_mapping button_context_list[] = { | |||
131 | static const struct button_mapping button_context_tree[] = { | 135 | static const struct button_mapping button_context_tree[] = { |
132 | { ACTION_TREE_WPS, BUTTON_HOME|BUTTON_SELECT, BUTTON_HOME }, | 136 | { ACTION_TREE_WPS, BUTTON_HOME|BUTTON_SELECT, BUTTON_HOME }, |
133 | { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, | 137 | { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, |
138 | #ifdef HAVE_HOTKEY | ||
139 | // { ACTION_TREE_HOTKEY, BUTTON_NONE, BUTTON_NONE }, | ||
140 | #endif | ||
134 | 141 | ||
135 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST), | 142 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST), |
136 | }; /* button_context_tree */ | 143 | }; /* button_context_tree */ |
diff --git a/apps/keymaps/keymap-creativezv.c b/apps/keymaps/keymap-creativezv.c index fb8e542520..4108980720 100644 --- a/apps/keymaps/keymap-creativezv.c +++ b/apps/keymaps/keymap-creativezv.c | |||
@@ -92,7 +92,11 @@ 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 | ||
95 | { ACTION_WPS_VIEW_PLAYLIST, BUTTON_POWER, BUTTON_NONE }, | 98 | { ACTION_WPS_VIEW_PLAYLIST, BUTTON_POWER, BUTTON_NONE }, |
99 | #endif | ||
96 | { ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, | 100 | { ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, |
97 | 101 | ||
98 | { ACTION_WPS_ID3SCREEN, BUTTON_BACK|BUTTON_REL, BUTTON_NONE }, | 102 | { ACTION_WPS_ID3SCREEN, BUTTON_BACK|BUTTON_REL, BUTTON_NONE }, |
@@ -109,6 +113,9 @@ static const struct button_mapping button_context_tree[] = { | |||
109 | { ACTION_TREE_STOP, BUTTON_POWER, BUTTON_NONE }, | 113 | { ACTION_TREE_STOP, BUTTON_POWER, BUTTON_NONE }, |
110 | { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, | 114 | { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, |
111 | { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REPEAT, BUTTON_NONE }, | 115 | { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REPEAT, BUTTON_NONE }, |
116 | #ifdef HAVE_HOTKEY | ||
117 | // { ACTION_TREE_HOTKEY, BUTTON_NONE, BUTTON_NONE }, | ||
118 | #endif | ||
112 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST) | 119 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST) |
113 | }; /* button_context_tree */ | 120 | }; /* button_context_tree */ |
114 | 121 | ||
diff --git a/apps/keymaps/keymap-creativezvm.c b/apps/keymaps/keymap-creativezvm.c index 37563248a1..5d1b25aa8d 100644 --- a/apps/keymaps/keymap-creativezvm.c +++ b/apps/keymaps/keymap-creativezvm.c | |||
@@ -91,7 +91,11 @@ 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 | ||
94 | { ACTION_WPS_VIEW_PLAYLIST, BUTTON_POWER, BUTTON_NONE }, | 97 | { ACTION_WPS_VIEW_PLAYLIST, BUTTON_POWER, BUTTON_NONE }, |
98 | #endif | ||
95 | { ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, | 99 | { ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, |
96 | 100 | ||
97 | { ACTION_WPS_ID3SCREEN, BUTTON_BACK|BUTTON_REL, BUTTON_NONE }, | 101 | { ACTION_WPS_ID3SCREEN, BUTTON_BACK|BUTTON_REL, BUTTON_NONE }, |
@@ -108,6 +112,9 @@ static const struct button_mapping button_context_tree[] = { | |||
108 | { ACTION_TREE_STOP, BUTTON_POWER, BUTTON_NONE }, | 112 | { ACTION_TREE_STOP, BUTTON_POWER, BUTTON_NONE }, |
109 | { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, | 113 | { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, |
110 | { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REPEAT, BUTTON_NONE }, | 114 | { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REPEAT, BUTTON_NONE }, |
115 | #ifdef HAVE_HOTKEY | ||
116 | // { ACTION_TREE_HOTKEY, BUTTON_NONE, BUTTON_NONE }, | ||
117 | #endif | ||
111 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST) | 118 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST) |
112 | }; /* button_context_tree */ | 119 | }; /* button_context_tree */ |
113 | 120 | ||
diff --git a/apps/keymaps/keymap-e200.c b/apps/keymaps/keymap-e200.c index 367fdcb88f..aca8a9d7e3 100644 --- a/apps/keymaps/keymap-e200.c +++ b/apps/keymaps/keymap-e200.c | |||
@@ -80,7 +80,7 @@ static const struct button_mapping button_context_wps[] = { | |||
80 | { ACTION_WPS_QUICKSCREEN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_DOWN }, | 80 | { ACTION_WPS_QUICKSCREEN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_DOWN }, |
81 | 81 | ||
82 | { ACTION_WPS_MENU, BUTTON_DOWN|BUTTON_REL, BUTTON_DOWN }, | 82 | { ACTION_WPS_MENU, BUTTON_DOWN|BUTTON_REL, BUTTON_DOWN }, |
83 | { ACTION_WPS_VIEW_PLAYLIST, BUTTON_REC|BUTTON_REL, BUTTON_REC }, | 83 | { ACTION_WPS_HOTKEY, BUTTON_REC|BUTTON_REL, BUTTON_REC }, |
84 | { ACTION_WPS_REC, BUTTON_REC|BUTTON_REPEAT, BUTTON_NONE }, | 84 | { ACTION_WPS_REC, BUTTON_REC|BUTTON_REPEAT, BUTTON_NONE }, |
85 | 85 | ||
86 | { ACTION_WPS_PITCHSCREEN, BUTTON_SELECT|BUTTON_UP, BUTTON_SELECT }, | 86 | { ACTION_WPS_PITCHSCREEN, BUTTON_SELECT|BUTTON_UP, BUTTON_SELECT }, |
@@ -115,6 +115,7 @@ static const struct button_mapping button_context_list[] = { | |||
115 | static const struct button_mapping button_context_tree[] = { | 115 | static const struct button_mapping button_context_tree[] = { |
116 | { ACTION_TREE_WPS, BUTTON_UP|BUTTON_REL, BUTTON_UP }, | 116 | { ACTION_TREE_WPS, BUTTON_UP|BUTTON_REL, BUTTON_UP }, |
117 | { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, | 117 | { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, |
118 | { ACTION_TREE_HOTKEY, BUTTON_REC|BUTTON_REL, BUTTON_REC }, | ||
118 | 119 | ||
119 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST), | 120 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST), |
120 | }; /* button_context_tree */ | 121 | }; /* button_context_tree */ |
diff --git a/apps/keymaps/keymap-fuze.c b/apps/keymaps/keymap-fuze.c index 416674f814..7463b5d3bb 100644 --- a/apps/keymaps/keymap-fuze.c +++ b/apps/keymaps/keymap-fuze.c | |||
@@ -83,7 +83,7 @@ static const struct button_mapping button_context_wps[] = { | |||
83 | 83 | ||
84 | { ACTION_WPS_PITCHSCREEN, BUTTON_SELECT|BUTTON_UP, BUTTON_SELECT }, | 84 | { ACTION_WPS_PITCHSCREEN, BUTTON_SELECT|BUTTON_UP, BUTTON_SELECT }, |
85 | { ACTION_WPS_ID3SCREEN, BUTTON_SELECT|BUTTON_DOWN, BUTTON_SELECT }, | 85 | { ACTION_WPS_ID3SCREEN, BUTTON_SELECT|BUTTON_DOWN, BUTTON_SELECT }, |
86 | { ACTION_WPS_VIEW_PLAYLIST, BUTTON_HOME|BUTTON_REL, BUTTON_HOME }, | 86 | { ACTION_WPS_HOTKEY, BUTTON_HOME|BUTTON_REL, BUTTON_HOME }, |
87 | 87 | ||
88 | LAST_ITEM_IN_LIST | 88 | LAST_ITEM_IN_LIST |
89 | }; /* button_context_wps */ | 89 | }; /* button_context_wps */ |
@@ -114,6 +114,7 @@ static const struct button_mapping button_context_list[] = { | |||
114 | static const struct button_mapping button_context_tree[] = { | 114 | static const struct button_mapping button_context_tree[] = { |
115 | { ACTION_TREE_WPS, BUTTON_UP|BUTTON_REL, BUTTON_UP }, | 115 | { ACTION_TREE_WPS, BUTTON_UP|BUTTON_REL, BUTTON_UP }, |
116 | { ACTION_TREE_STOP, BUTTON_HOME|BUTTON_REPEAT, BUTTON_HOME }, | 116 | { ACTION_TREE_STOP, BUTTON_HOME|BUTTON_REPEAT, BUTTON_HOME }, |
117 | { ACTION_TREE_HOTKEY, BUTTON_HOME|BUTTON_REL, BUTTON_HOME }, | ||
117 | 118 | ||
118 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST), | 119 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST), |
119 | }; /* button_context_tree */ | 120 | }; /* button_context_tree */ |
diff --git a/apps/keymaps/keymap-gigabeat-s.c b/apps/keymaps/keymap-gigabeat-s.c index d690b24e77..343d6b4f9c 100644 --- a/apps/keymaps/keymap-gigabeat-s.c +++ b/apps/keymaps/keymap-gigabeat-s.c | |||
@@ -100,7 +100,11 @@ 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 | ||
103 | { ACTION_WPS_VIEW_PLAYLIST, BUTTON_BACK|BUTTON_DOWN, BUTTON_NONE }, | 106 | { ACTION_WPS_VIEW_PLAYLIST, BUTTON_BACK|BUTTON_DOWN, BUTTON_NONE }, |
107 | #endif | ||
104 | 108 | ||
105 | { ACTION_WPS_QUICKSCREEN, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, | 109 | { ACTION_WPS_QUICKSCREEN, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, |
106 | { ACTION_WPS_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, | 110 | { ACTION_WPS_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, |
@@ -134,6 +138,9 @@ static const struct button_mapping button_context_tree[] = { | |||
134 | { ACTION_TREE_STOP, BUTTON_POWER, BUTTON_NONE }, | 138 | { ACTION_TREE_STOP, BUTTON_POWER, BUTTON_NONE }, |
135 | { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, | 139 | { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, |
136 | { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REPEAT, BUTTON_NONE }, | 140 | { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REPEAT, BUTTON_NONE }, |
141 | #ifdef HAVE_HOTKEY | ||
142 | // { ACTION_TREE_HOTKEY,BUTTON_NONE, BUTTON_NONE }, | ||
143 | #endif | ||
137 | 144 | ||
138 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST) | 145 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST) |
139 | }; /* button_context_tree */ | 146 | }; /* button_context_tree */ |
diff --git a/apps/keymaps/keymap-gigabeat.c b/apps/keymaps/keymap-gigabeat.c index ccb6084ada..61d0a593c8 100644 --- a/apps/keymaps/keymap-gigabeat.c +++ b/apps/keymaps/keymap-gigabeat.c | |||
@@ -93,7 +93,11 @@ 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 | ||
96 | { ACTION_WPS_VIEW_PLAYLIST, BUTTON_A|BUTTON_DOWN, BUTTON_NONE }, | 99 | { ACTION_WPS_VIEW_PLAYLIST, BUTTON_A|BUTTON_DOWN, BUTTON_NONE }, |
100 | #endif | ||
97 | 101 | ||
98 | { ACTION_WPS_QUICKSCREEN, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, | 102 | { ACTION_WPS_QUICKSCREEN, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, |
99 | { ACTION_WPS_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, | 103 | { ACTION_WPS_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, |
@@ -127,6 +131,9 @@ static const struct button_mapping button_context_tree[] = { | |||
127 | { ACTION_TREE_STOP, BUTTON_POWER, BUTTON_NONE }, | 131 | { ACTION_TREE_STOP, BUTTON_POWER, BUTTON_NONE }, |
128 | { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, | 132 | { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, |
129 | { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REPEAT, BUTTON_NONE }, | 133 | { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REPEAT, BUTTON_NONE }, |
134 | #ifdef HAVE_HOTKEY | ||
135 | // { ACTION_TREE_HOTKEY, BUTTON_NONE, BUTTON_NONE }, | ||
136 | #endif | ||
130 | 137 | ||
131 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST) | 138 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST) |
132 | }; /* button_context_tree */ | 139 | }; /* button_context_tree */ |
diff --git a/apps/keymaps/keymap-h10.c b/apps/keymaps/keymap-h10.c index 8597e24023..ffda90c4e8 100644 --- a/apps/keymaps/keymap-h10.c +++ b/apps/keymaps/keymap-h10.c | |||
@@ -87,7 +87,7 @@ static const struct button_mapping button_context_wps[] = { | |||
87 | { ACTION_WPS_CONTEXT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_RIGHT }, | 87 | { ACTION_WPS_CONTEXT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_RIGHT }, |
88 | { ACTION_WPS_QUICKSCREEN, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT }, | 88 | { ACTION_WPS_QUICKSCREEN, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT }, |
89 | { ACTION_WPS_MENU, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, | 89 | { ACTION_WPS_MENU, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, |
90 | { ACTION_WPS_VIEW_PLAYLIST, BUTTON_POWER|BUTTON_PLAY, BUTTON_NONE }, | 90 | { ACTION_WPS_HOTKEY, BUTTON_POWER|BUTTON_PLAY, BUTTON_NONE }, |
91 | { ACTION_WPS_PITCHSCREEN, BUTTON_PLAY|BUTTON_LEFT, BUTTON_PLAY }, | 91 | { ACTION_WPS_PITCHSCREEN, BUTTON_PLAY|BUTTON_LEFT, BUTTON_PLAY }, |
92 | { ACTION_WPS_ID3SCREEN, BUTTON_PLAY|BUTTON_RIGHT, BUTTON_PLAY }, | 92 | { ACTION_WPS_ID3SCREEN, BUTTON_PLAY|BUTTON_RIGHT, BUTTON_PLAY }, |
93 | 93 | ||
@@ -146,6 +146,7 @@ static const struct button_mapping remote_button_context_list[] = { | |||
146 | static const struct button_mapping button_context_tree[] = { | 146 | static const struct button_mapping button_context_tree[] = { |
147 | { ACTION_TREE_WPS, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, | 147 | { ACTION_TREE_WPS, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, |
148 | { ACTION_TREE_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, | 148 | { ACTION_TREE_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, |
149 | { ACTION_TREE_HOTKEY, BUTTON_POWER|BUTTON_PLAY, BUTTON_NONE }, | ||
149 | 150 | ||
150 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST), | 151 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST), |
151 | }; /* button_context_tree */ | 152 | }; /* button_context_tree */ |
diff --git a/apps/keymaps/keymap-h1x0_h3x0.c b/apps/keymaps/keymap-h1x0_h3x0.c index 64d0f30b8e..31e38533f3 100644 --- a/apps/keymaps/keymap-h1x0_h3x0.c +++ b/apps/keymaps/keymap-h1x0_h3x0.c | |||
@@ -92,7 +92,7 @@ static const struct button_mapping button_context_wps[] = { | |||
92 | { ACTION_WPS_ABRESET, BUTTON_ON|BUTTON_SELECT, BUTTON_ON }, | 92 | { ACTION_WPS_ABRESET, BUTTON_ON|BUTTON_SELECT, BUTTON_ON }, |
93 | { ACTION_WPS_ID3SCREEN, BUTTON_ON|BUTTON_MODE, BUTTON_NONE }, | 93 | { ACTION_WPS_ID3SCREEN, BUTTON_ON|BUTTON_MODE, BUTTON_NONE }, |
94 | { ACTION_WPS_REC, BUTTON_REC|BUTTON_REPEAT, BUTTON_NONE }, | 94 | { ACTION_WPS_REC, BUTTON_REC|BUTTON_REPEAT, BUTTON_NONE }, |
95 | { ACTION_WPS_VIEW_PLAYLIST, BUTTON_REC|BUTTON_REL, BUTTON_REC }, | 95 | { ACTION_WPS_HOTKEY, BUTTON_REC|BUTTON_REL, BUTTON_REC }, |
96 | 96 | ||
97 | LAST_ITEM_IN_LIST | 97 | LAST_ITEM_IN_LIST |
98 | }; /* button_context_wps */ | 98 | }; /* button_context_wps */ |
@@ -112,6 +112,7 @@ static const struct button_mapping button_context_tree[] = { | |||
112 | { ACTION_TREE_WPS, BUTTON_ON|BUTTON_REL, BUTTON_ON }, | 112 | { ACTION_TREE_WPS, BUTTON_ON|BUTTON_REL, BUTTON_ON }, |
113 | { ACTION_TREE_STOP, BUTTON_OFF, BUTTON_NONE }, | 113 | { ACTION_TREE_STOP, BUTTON_OFF, BUTTON_NONE }, |
114 | { ACTION_TREE_STOP, BUTTON_OFF|BUTTON_REPEAT, BUTTON_NONE }, | 114 | { ACTION_TREE_STOP, BUTTON_OFF|BUTTON_REPEAT, BUTTON_NONE }, |
115 | { ACTION_TREE_HOTKEY, BUTTON_REC|BUTTON_REL, BUTTON_REC }, | ||
115 | 116 | ||
116 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST) | 117 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST) |
117 | }; /* button_context_tree */ | 118 | }; /* button_context_tree */ |
diff --git a/apps/keymaps/keymap-hdd1630.c b/apps/keymaps/keymap-hdd1630.c index d43fcd837d..b8de5eb84b 100644 --- a/apps/keymaps/keymap-hdd1630.c +++ b/apps/keymaps/keymap-hdd1630.c | |||
@@ -93,7 +93,11 @@ 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 | ||
96 | { ACTION_WPS_VIEW_PLAYLIST, BUTTON_VIEW|BUTTON_DOWN, BUTTON_VIEW }, | 99 | { ACTION_WPS_VIEW_PLAYLIST, BUTTON_VIEW|BUTTON_DOWN, BUTTON_VIEW }, |
100 | #endif | ||
97 | 101 | ||
98 | { ACTION_WPS_QUICKSCREEN, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, | 102 | { ACTION_WPS_QUICKSCREEN, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, |
99 | { ACTION_WPS_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, | 103 | { ACTION_WPS_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, |
@@ -127,6 +131,9 @@ static const struct button_mapping button_context_tree[] = { | |||
127 | { ACTION_TREE_STOP, BUTTON_POWER, BUTTON_NONE }, | 131 | { ACTION_TREE_STOP, BUTTON_POWER, BUTTON_NONE }, |
128 | { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, | 132 | { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, |
129 | { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REPEAT, BUTTON_NONE }, | 133 | { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REPEAT, BUTTON_NONE }, |
134 | #ifdef HAVE_HOTKEY | ||
135 | // { ACTION_TREE_HOTKEY, BUTTON_NONE, BUTTON_NONE }, | ||
136 | #endif | ||
130 | 137 | ||
131 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST) | 138 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST) |
132 | }; /* button_context_tree */ | 139 | }; /* button_context_tree */ |
diff --git a/apps/keymaps/keymap-hdd6330.c b/apps/keymaps/keymap-hdd6330.c index d43fcd837d..b8de5eb84b 100644 --- a/apps/keymaps/keymap-hdd6330.c +++ b/apps/keymaps/keymap-hdd6330.c | |||
@@ -93,7 +93,11 @@ 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 | ||
96 | { ACTION_WPS_VIEW_PLAYLIST, BUTTON_VIEW|BUTTON_DOWN, BUTTON_VIEW }, | 99 | { ACTION_WPS_VIEW_PLAYLIST, BUTTON_VIEW|BUTTON_DOWN, BUTTON_VIEW }, |
100 | #endif | ||
97 | 101 | ||
98 | { ACTION_WPS_QUICKSCREEN, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, | 102 | { ACTION_WPS_QUICKSCREEN, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, |
99 | { ACTION_WPS_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, | 103 | { ACTION_WPS_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, |
@@ -127,6 +131,9 @@ static const struct button_mapping button_context_tree[] = { | |||
127 | { ACTION_TREE_STOP, BUTTON_POWER, BUTTON_NONE }, | 131 | { ACTION_TREE_STOP, BUTTON_POWER, BUTTON_NONE }, |
128 | { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, | 132 | { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, |
129 | { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REPEAT, BUTTON_NONE }, | 133 | { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REPEAT, BUTTON_NONE }, |
134 | #ifdef HAVE_HOTKEY | ||
135 | // { ACTION_TREE_HOTKEY, BUTTON_NONE, BUTTON_NONE }, | ||
136 | #endif | ||
130 | 137 | ||
131 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST) | 138 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST) |
132 | }; /* button_context_tree */ | 139 | }; /* button_context_tree */ |
diff --git a/apps/keymaps/keymap-iaudio67.c b/apps/keymaps/keymap-iaudio67.c index ec700c5411..45e85d439b 100644 --- a/apps/keymaps/keymap-iaudio67.c +++ b/apps/keymaps/keymap-iaudio67.c | |||
@@ -71,7 +71,11 @@ static const struct button_mapping button_context_wps[] = { | |||
71 | { ACTION_WPS_STOPSEEK, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT|BUTTON_REPEAT }, | 71 | { ACTION_WPS_STOPSEEK, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT|BUTTON_REPEAT }, |
72 | 72 | ||
73 | { ACTION_WPS_PLAY, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, | 73 | { ACTION_WPS_PLAY, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, |
74 | #ifdef HAVE_HOTKEY | ||
75 | { ACTION_WPS_HOTKEY, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE }, | ||
76 | #else | ||
74 | { ACTION_WPS_VIEW_PLAYLIST, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE }, | 77 | { ACTION_WPS_VIEW_PLAYLIST, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE }, |
78 | #endif | ||
75 | { ACTION_WPS_STOP, BUTTON_STOP, BUTTON_NONE }, | 79 | { ACTION_WPS_STOP, BUTTON_STOP, BUTTON_NONE }, |
76 | 80 | ||
77 | LAST_ITEM_IN_LIST | 81 | LAST_ITEM_IN_LIST |
@@ -111,6 +115,9 @@ static const struct button_mapping button_context_list[] = { | |||
111 | static const struct button_mapping button_context_tree[] = { | 115 | static const struct button_mapping button_context_tree[] = { |
112 | // { ACTION_TREE_WPS, BUTTON_REC|BUTTON_VOLUP, BUTTON_REC }, | 116 | // { ACTION_TREE_WPS, BUTTON_REC|BUTTON_VOLUP, BUTTON_REC }, |
113 | // { ACTION_TREE_STOP, BUTTON_REC|BUTTON_VOLUP|BUTTON_REPEAT, BUTTON_REC|BUTTON_VOLUP }, | 117 | // { ACTION_TREE_STOP, BUTTON_REC|BUTTON_VOLUP|BUTTON_REPEAT, BUTTON_REC|BUTTON_VOLUP }, |
118 | #ifdef HAVE_HOTKEY | ||
119 | // { ACTION_TREE_HOTKEY, BUTTON_NONE, BUTTON_NONE }, | ||
120 | #endif | ||
114 | 121 | ||
115 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST), | 122 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST), |
116 | }; /* button_context_tree */ | 123 | }; /* button_context_tree */ |
diff --git a/apps/keymaps/keymap-ipod.c b/apps/keymaps/keymap-ipod.c index 751c6d89aa..8b65f96130 100644 --- a/apps/keymaps/keymap-ipod.c +++ b/apps/keymaps/keymap-ipod.c | |||
@@ -59,6 +59,7 @@ static const struct button_mapping button_context_standard[] = { | |||
59 | static const struct button_mapping button_context_tree[] = { | 59 | static const struct button_mapping button_context_tree[] = { |
60 | { ACTION_TREE_WPS, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, | 60 | { ACTION_TREE_WPS, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, |
61 | { ACTION_TREE_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, | 61 | { ACTION_TREE_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, |
62 | { ACTION_TREE_HOTKEY, BUTTON_SELECT|BUTTON_PLAY, BUTTON_NONE }, | ||
62 | 63 | ||
63 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | 64 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
64 | }; /* button_context_tree */ | 65 | }; /* button_context_tree */ |
@@ -91,7 +92,7 @@ static const struct button_mapping button_context_wps[] = { | |||
91 | { ACTION_WPS_VOLUP, BUTTON_SCROLL_FWD|BUTTON_REPEAT, BUTTON_NONE }, | 92 | { ACTION_WPS_VOLUP, BUTTON_SCROLL_FWD|BUTTON_REPEAT, BUTTON_NONE }, |
92 | { ACTION_WPS_BROWSE, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, | 93 | { ACTION_WPS_BROWSE, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, |
93 | { ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, | 94 | { ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, |
94 | { ACTION_WPS_VIEW_PLAYLIST, BUTTON_SELECT|BUTTON_PLAY, BUTTON_NONE }, | 95 | { ACTION_WPS_HOTKEY, BUTTON_SELECT|BUTTON_PLAY, BUTTON_NONE }, |
95 | { ACTION_WPS_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, | 96 | { ACTION_WPS_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, |
96 | { ACTION_WPS_QUICKSCREEN, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, | 97 | { ACTION_WPS_QUICKSCREEN, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, |
97 | 98 | ||
diff --git a/apps/keymaps/keymap-m3.c b/apps/keymaps/keymap-m3.c index 4449d77068..b6968e6ff0 100644 --- a/apps/keymaps/keymap-m3.c +++ b/apps/keymaps/keymap-m3.c | |||
@@ -292,6 +292,7 @@ static const struct button_mapping button_context_tree[] = { | |||
292 | { ACTION_NONE, BUTTON_PLAY, BUTTON_NONE }, | 292 | { ACTION_NONE, BUTTON_PLAY, BUTTON_NONE }, |
293 | { ACTION_TREE_WPS, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, | 293 | { ACTION_TREE_WPS, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, |
294 | { ACTION_TREE_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, | 294 | { ACTION_TREE_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, |
295 | { ACTION_TREE_HOTKEY, BUTTON_REC|BUTTON_MODE, BUTTON_REC }, | ||
295 | 296 | ||
296 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | 297 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
297 | }; /* button_context_tree */ | 298 | }; /* button_context_tree */ |
@@ -352,7 +353,7 @@ static const struct button_mapping button_context_wps[] = { | |||
352 | { ACTION_WPS_CONTEXT, BUTTON_MODE|BUTTON_REPEAT, BUTTON_MODE }, | 353 | { ACTION_WPS_CONTEXT, BUTTON_MODE|BUTTON_REPEAT, BUTTON_MODE }, |
353 | { ACTION_WPS_MENU, BUTTON_REC|BUTTON_REL, BUTTON_REC }, | 354 | { ACTION_WPS_MENU, BUTTON_REC|BUTTON_REL, BUTTON_REC }, |
354 | { ACTION_WPS_QUICKSCREEN, BUTTON_REC|BUTTON_REPEAT, BUTTON_REC }, | 355 | { ACTION_WPS_QUICKSCREEN, BUTTON_REC|BUTTON_REPEAT, BUTTON_REC }, |
355 | { ACTION_WPS_VIEW_PLAYLIST,BUTTON_REC|BUTTON_MODE, BUTTON_REC }, | 356 | { ACTION_WPS_HOTKEY, BUTTON_REC|BUTTON_MODE, BUTTON_REC }, |
356 | 357 | ||
357 | LAST_ITEM_IN_LIST | 358 | LAST_ITEM_IN_LIST |
358 | }; /* button_context_wps */ | 359 | }; /* button_context_wps */ |
diff --git a/apps/keymaps/keymap-meizu-m6sl.c b/apps/keymaps/keymap-meizu-m6sl.c index 2dcb81bec0..c81b25729c 100644 --- a/apps/keymaps/keymap-meizu-m6sl.c +++ b/apps/keymaps/keymap-meizu-m6sl.c | |||
@@ -88,7 +88,11 @@ 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 | ||
91 | { ACTION_WPS_VIEW_PLAYLIST, BUTTON_PLAY|BUTTON_DOWN, BUTTON_PLAY }, | 94 | { ACTION_WPS_VIEW_PLAYLIST, BUTTON_PLAY|BUTTON_DOWN, BUTTON_PLAY }, |
95 | #endif | ||
92 | 96 | ||
93 | { ACTION_WPS_QUICKSCREEN, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, | 97 | { ACTION_WPS_QUICKSCREEN, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, |
94 | { ACTION_WPS_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, | 98 | { ACTION_WPS_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, |
@@ -114,6 +118,9 @@ static const struct button_mapping button_context_list[] = { | |||
114 | static const struct button_mapping button_context_tree[] = { | 118 | static const struct button_mapping button_context_tree[] = { |
115 | { ACTION_TREE_WPS, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, | 119 | { ACTION_TREE_WPS, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, |
116 | { ACTION_TREE_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE }, | 120 | { ACTION_TREE_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE }, |
121 | #ifdef HAVE_HOTKEY | ||
122 | // { ACTION_TREE_HOTKEY, BUTTON_NONE, BUTTON_NONE }, | ||
123 | #endif | ||
117 | 124 | ||
118 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST) | 125 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST) |
119 | }; /* button_context_tree */ | 126 | }; /* button_context_tree */ |
diff --git a/apps/keymaps/keymap-mini2440.c b/apps/keymaps/keymap-mini2440.c index c53b9ae1c9..db145aa480 100644 --- a/apps/keymaps/keymap-mini2440.c +++ b/apps/keymaps/keymap-mini2440.c | |||
@@ -95,7 +95,11 @@ 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 | ||
98 | { ACTION_WPS_VIEW_PLAYLIST, BUTTON_A|BUTTON_DOWN, BUTTON_NONE }, | 101 | { ACTION_WPS_VIEW_PLAYLIST, BUTTON_A|BUTTON_DOWN, BUTTON_NONE }, |
102 | #endif | ||
99 | 103 | ||
100 | { ACTION_WPS_QUICKSCREEN, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, | 104 | { ACTION_WPS_QUICKSCREEN, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, |
101 | { ACTION_WPS_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, | 105 | { ACTION_WPS_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, |
@@ -129,6 +133,9 @@ static const struct button_mapping button_context_tree[] = { | |||
129 | { ACTION_TREE_STOP, BUTTON_POWER, BUTTON_NONE }, | 133 | { ACTION_TREE_STOP, BUTTON_POWER, BUTTON_NONE }, |
130 | { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, | 134 | { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, |
131 | { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REPEAT, BUTTON_NONE }, | 135 | { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REPEAT, BUTTON_NONE }, |
136 | #ifdef HAVE_HOTKEY | ||
137 | // { ACTION_TREE_HOTKEY, BUTTON_NONE, BUTTON_NONE }, | ||
138 | #endif | ||
132 | 139 | ||
133 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST) | 140 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST) |
134 | }; /* button_context_tree */ | 141 | }; /* button_context_tree */ |
diff --git a/apps/keymaps/keymap-mr100.c b/apps/keymaps/keymap-mr100.c index dd2539f381..5a13f31402 100644 --- a/apps/keymaps/keymap-mr100.c +++ b/apps/keymaps/keymap-mr100.c | |||
@@ -94,7 +94,11 @@ 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 | ||
97 | { ACTION_WPS_VIEW_PLAYLIST, BUTTON_DISPLAY|BUTTON_DOWN, BUTTON_DISPLAY }, | 100 | { ACTION_WPS_VIEW_PLAYLIST, BUTTON_DISPLAY|BUTTON_DOWN, BUTTON_DISPLAY }, |
101 | #endif | ||
98 | { ACTION_WPS_ID3SCREEN, BUTTON_DISPLAY|BUTTON_MENU, BUTTON_NONE }, | 102 | { ACTION_WPS_ID3SCREEN, BUTTON_DISPLAY|BUTTON_MENU, BUTTON_NONE }, |
99 | 103 | ||
100 | { ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, | 104 | { ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, |
@@ -119,6 +123,9 @@ static const struct button_mapping button_context_tree[] = { | |||
119 | { ACTION_TREE_STOP, BUTTON_POWER, BUTTON_NONE }, | 123 | { ACTION_TREE_STOP, BUTTON_POWER, BUTTON_NONE }, |
120 | { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, | 124 | { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, |
121 | { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REPEAT, BUTTON_NONE }, | 125 | { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REPEAT, BUTTON_NONE }, |
126 | #ifdef HAVE_HOTKEY | ||
127 | // { ACTION_TREE_HOTKEY, BUTTON_NONE, BUTTON_NONE }, | ||
128 | #endif | ||
122 | 129 | ||
123 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST) | 130 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST) |
124 | }; /* button_context_tree */ | 131 | }; /* button_context_tree */ |
diff --git a/apps/keymaps/keymap-player.c b/apps/keymaps/keymap-player.c index 5fce6be83e..193413e473 100644 --- a/apps/keymaps/keymap-player.c +++ b/apps/keymaps/keymap-player.c | |||
@@ -63,7 +63,7 @@ static const struct button_mapping button_context_wps[] = { | |||
63 | { ACTION_WPS_CONTEXT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, | 63 | { ACTION_WPS_CONTEXT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, |
64 | { ACTION_WPS_ID3SCREEN, BUTTON_MENU|BUTTON_ON, BUTTON_NONE }, | 64 | { ACTION_WPS_ID3SCREEN, BUTTON_MENU|BUTTON_ON, BUTTON_NONE }, |
65 | { ACTION_STD_KEYLOCK, BUTTON_MENU|BUTTON_STOP, BUTTON_NONE }, | 65 | { ACTION_STD_KEYLOCK, BUTTON_MENU|BUTTON_STOP, BUTTON_NONE }, |
66 | { ACTION_WPS_VIEW_PLAYLIST,BUTTON_MENU|BUTTON_ON, BUTTON_NONE }, | 66 | { ACTION_WPS_HOTKEY, BUTTON_MENU|BUTTON_ON, BUTTON_NONE }, |
67 | 67 | ||
68 | LAST_ITEM_IN_LIST | 68 | LAST_ITEM_IN_LIST |
69 | }; | 69 | }; |
@@ -79,6 +79,7 @@ static const struct button_mapping button_context_settings[] = { | |||
79 | 79 | ||
80 | static const struct button_mapping button_context_tree[] = { | 80 | static const struct button_mapping button_context_tree[] = { |
81 | { ACTION_TREE_WPS, BUTTON_ON, BUTTON_NONE }, | 81 | { ACTION_TREE_WPS, BUTTON_ON, BUTTON_NONE }, |
82 | { ACTION_TREE_HOTKEY, BUTTON_MENU|BUTTON_ON, BUTTON_NONE }, | ||
82 | 83 | ||
83 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | 84 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
84 | }; /* button_context_listtree */ | 85 | }; /* button_context_listtree */ |
diff --git a/apps/keymaps/keymap-recorder.c b/apps/keymaps/keymap-recorder.c index c2ac45e0d6..8b395e2700 100644 --- a/apps/keymaps/keymap-recorder.c +++ b/apps/keymaps/keymap-recorder.c | |||
@@ -76,7 +76,7 @@ static const struct button_mapping button_context_wps[] = { | |||
76 | { ACTION_WPS_MENU, BUTTON_F1|BUTTON_REL, BUTTON_F1 }, | 76 | { ACTION_WPS_MENU, BUTTON_F1|BUTTON_REL, BUTTON_F1 }, |
77 | { ACTION_WPS_CONTEXT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, | 77 | { ACTION_WPS_CONTEXT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, |
78 | { ACTION_WPS_QUICKSCREEN, BUTTON_F2|BUTTON_REPEAT, BUTTON_NONE }, | 78 | { ACTION_WPS_QUICKSCREEN, BUTTON_F2|BUTTON_REPEAT, BUTTON_NONE }, |
79 | { ACTION_WPS_VIEW_PLAYLIST,BUTTON_F2|BUTTON_REL, BUTTON_F2 }, | 79 | { ACTION_WPS_HOTKEY, BUTTON_F2|BUTTON_REL, BUTTON_F2 }, |
80 | { ACTION_WPS_BROWSE, BUTTON_ON|BUTTON_REL, BUTTON_ON }, | 80 | { ACTION_WPS_BROWSE, BUTTON_ON|BUTTON_REL, BUTTON_ON }, |
81 | { ACTION_WPS_ID3SCREEN, BUTTON_F1|BUTTON_ON, BUTTON_NONE }, | 81 | { ACTION_WPS_ID3SCREEN, BUTTON_F1|BUTTON_ON, BUTTON_NONE }, |
82 | { ACTION_WPS_PITCHSCREEN, BUTTON_ON|BUTTON_UP, BUTTON_ON }, | 82 | { ACTION_WPS_PITCHSCREEN, BUTTON_ON|BUTTON_UP, BUTTON_ON }, |
@@ -107,6 +107,7 @@ static const struct button_mapping button_context_settings[] = { | |||
107 | static const struct button_mapping button_context_tree[] = { | 107 | static const struct button_mapping button_context_tree[] = { |
108 | { ACTION_TREE_WPS, BUTTON_ON|BUTTON_REL, BUTTON_ON }, | 108 | { ACTION_TREE_WPS, BUTTON_ON|BUTTON_REL, BUTTON_ON }, |
109 | { ACTION_TREE_STOP, BUTTON_OFF, BUTTON_NONE }, | 109 | { ACTION_TREE_STOP, BUTTON_OFF, BUTTON_NONE }, |
110 | { ACTION_TREE_HOTKEY, BUTTON_F2|BUTTON_REL, BUTTON_F2 }, | ||
110 | { ACTION_NONE, BUTTON_ON, BUTTON_NONE }, | 111 | { ACTION_NONE, BUTTON_ON, BUTTON_NONE }, |
111 | { ACTION_LISTTREE_PGUP, BUTTON_ON|BUTTON_UP, BUTTON_ON }, | 112 | { ACTION_LISTTREE_PGUP, BUTTON_ON|BUTTON_UP, BUTTON_ON }, |
112 | { ACTION_LISTTREE_PGUP, BUTTON_UP|BUTTON_REL, BUTTON_ON|BUTTON_UP }, | 113 | { ACTION_LISTTREE_PGUP, BUTTON_UP|BUTTON_REL, BUTTON_ON|BUTTON_UP }, |
diff --git a/apps/keymaps/keymap-sa9200.c b/apps/keymaps/keymap-sa9200.c index d7405588b5..3c98484b26 100644 --- a/apps/keymaps/keymap-sa9200.c +++ b/apps/keymaps/keymap-sa9200.c | |||
@@ -100,7 +100,11 @@ 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 }, | ||
105 | #else | ||
103 | { ACTION_WPS_VIEW_PLAYLIST, BUTTON_NEXT|BUTTON_REL, BUTTON_NEXT }, | 106 | { ACTION_WPS_VIEW_PLAYLIST, BUTTON_NEXT|BUTTON_REL, BUTTON_NEXT }, |
107 | #endif | ||
104 | { ACTION_WPS_ID3SCREEN, BUTTON_PREV|BUTTON_REPEAT, BUTTON_NONE }, | 108 | { ACTION_WPS_ID3SCREEN, BUTTON_PREV|BUTTON_REPEAT, BUTTON_NONE }, |
105 | 109 | ||
106 | LAST_ITEM_IN_LIST | 110 | LAST_ITEM_IN_LIST |
@@ -124,6 +128,9 @@ static const struct button_mapping button_context_list[] = { | |||
124 | static const struct button_mapping button_context_tree[] = { | 128 | static const struct button_mapping button_context_tree[] = { |
125 | { ACTION_TREE_WPS, BUTTON_PREV|BUTTON_REPEAT, BUTTON_NONE }, | 129 | { ACTION_TREE_WPS, BUTTON_PREV|BUTTON_REPEAT, BUTTON_NONE }, |
126 | { ACTION_TREE_STOP, BUTTON_NEXT|BUTTON_REPEAT, BUTTON_NONE }, | 130 | { ACTION_TREE_STOP, BUTTON_NEXT|BUTTON_REPEAT, BUTTON_NONE }, |
131 | #ifdef HAVE_HOTKEY | ||
132 | // { ACTION_TREE_HOTKEY, BUTTON_NONE, BUTTON_NONE }, | ||
133 | #endif | ||
127 | 134 | ||
128 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST) | 135 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST) |
129 | }; /* button_context_tree */ | 136 | }; /* button_context_tree */ |
diff --git a/apps/keymaps/keymap-touchscreen.c b/apps/keymaps/keymap-touchscreen.c index 6d3a515da7..8c2397f48c 100644 --- a/apps/keymaps/keymap-touchscreen.c +++ b/apps/keymaps/keymap-touchscreen.c | |||
@@ -92,7 +92,11 @@ static const struct button_mapping button_context_wps[] = { | |||
92 | 92 | ||
93 | { ACTION_WPS_MENU, BUTTON_TOPLEFT|BUTTON_REL, BUTTON_TOPLEFT }, | 93 | { ACTION_WPS_MENU, BUTTON_TOPLEFT|BUTTON_REL, BUTTON_TOPLEFT }, |
94 | { ACTION_WPS_QUICKSCREEN, BUTTON_BOTTOMLEFT|BUTTON_REL, BUTTON_BOTTOMLEFT }, | 94 | { ACTION_WPS_QUICKSCREEN, BUTTON_BOTTOMLEFT|BUTTON_REL, BUTTON_BOTTOMLEFT }, |
95 | #ifdef HAVE_HOTKEY | ||
96 | { ACTION_WPS_HOTKEY, BUTTON_BOTTOMRIGHT|BUTTON_REL, BUTTON_BOTTOMRIGHT }, | ||
97 | #else | ||
95 | { ACTION_WPS_VIEW_PLAYLIST, BUTTON_BOTTOMRIGHT|BUTTON_REL, BUTTON_BOTTOMRIGHT }, | 98 | { ACTION_WPS_VIEW_PLAYLIST, BUTTON_BOTTOMRIGHT|BUTTON_REL, BUTTON_BOTTOMRIGHT }, |
99 | #endif | ||
96 | { ACTION_WPS_REC, BUTTON_TOPLEFT|BUTTON_REPEAT, BUTTON_TOPLEFT }, | 100 | { ACTION_WPS_REC, BUTTON_TOPLEFT|BUTTON_REPEAT, BUTTON_TOPLEFT }, |
97 | { ACTION_WPS_PITCHSCREEN, BUTTON_BOTTOMLEFT|BUTTON_REPEAT, BUTTON_BOTTOMLEFT }, | 101 | { ACTION_WPS_PITCHSCREEN, BUTTON_BOTTOMLEFT|BUTTON_REPEAT, BUTTON_BOTTOMLEFT }, |
98 | { ACTION_WPS_ID3SCREEN, BUTTON_BOTTOMRIGHT|BUTTON_REPEAT, BUTTON_BOTTOMRIGHT }, | 102 | { ACTION_WPS_ID3SCREEN, BUTTON_BOTTOMRIGHT|BUTTON_REPEAT, BUTTON_BOTTOMRIGHT }, |
@@ -122,6 +126,9 @@ static const struct button_mapping button_context_list[] = { | |||
122 | static const struct button_mapping button_context_tree[] = { | 126 | static const struct button_mapping button_context_tree[] = { |
123 | { ACTION_TREE_WPS, BUTTON_TOPRIGHT|BUTTON_REL, BUTTON_TOPRIGHT }, | 127 | { ACTION_TREE_WPS, BUTTON_TOPRIGHT|BUTTON_REL, BUTTON_TOPRIGHT }, |
124 | { ACTION_TREE_STOP, BUTTON_BOTTOMRIGHT|BUTTON_REL, BUTTON_BOTTOMRIGHT }, | 128 | { ACTION_TREE_STOP, BUTTON_BOTTOMRIGHT|BUTTON_REL, BUTTON_BOTTOMRIGHT }, |
129 | #ifdef HAVE_HOTKEY | ||
130 | // { ACTION_TREE_HOTKEY, BUTTON_NONE, BUTTON_NONE }, | ||
131 | #endif | ||
125 | 132 | ||
126 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM2|CONTEXT_CUSTOM|CONTEXT_TREE) | 133 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM2|CONTEXT_CUSTOM|CONTEXT_TREE) |
127 | }; /* button_context_tree */ | 134 | }; /* button_context_tree */ |
diff --git a/apps/keymaps/keymap-vibe500.c b/apps/keymaps/keymap-vibe500.c index 0a4cf83921..ae0756d1d3 100644 --- a/apps/keymaps/keymap-vibe500.c +++ b/apps/keymaps/keymap-vibe500.c | |||
@@ -66,7 +66,11 @@ 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 | ||
70 | { ACTION_WPS_HOTKEY, BUTTON_CANCEL, BUTTON_NONE }, | ||
71 | #else | ||
69 | { ACTION_WPS_VIEW_PLAYLIST, BUTTON_CANCEL, BUTTON_NONE }, | 72 | { ACTION_WPS_VIEW_PLAYLIST, BUTTON_CANCEL, BUTTON_NONE }, |
73 | #endif | ||
70 | { ACTION_WPS_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, | 74 | { ACTION_WPS_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, |
71 | { ACTION_WPS_QUICKSCREEN, BUTTON_OK|BUTTON_REPEAT, BUTTON_OK }, | 75 | { ACTION_WPS_QUICKSCREEN, BUTTON_OK|BUTTON_REPEAT, BUTTON_OK }, |
72 | 76 | ||
@@ -76,6 +80,9 @@ static const struct button_mapping button_context_wps[] = { | |||
76 | static const struct button_mapping button_context_tree[] = { | 80 | static const struct button_mapping button_context_tree[] = { |
77 | { ACTION_TREE_WPS, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, | 81 | { ACTION_TREE_WPS, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, |
78 | { ACTION_TREE_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, | 82 | { ACTION_TREE_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, |
83 | #ifdef HAVE_HOTKEY | ||
84 | // { ACTION_TREE_HOTKEY, BUTTON_NONE, BUTTON_NONE }, | ||
85 | #endif | ||
79 | 86 | ||
80 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | 87 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
81 | }; /* button_context_tree */ | 88 | }; /* button_context_tree */ |
diff --git a/apps/keymaps/keymap-yh8xx_yh9xx.c b/apps/keymaps/keymap-yh8xx_yh9xx.c index 7ae787a291..c64263d809 100644 --- a/apps/keymaps/keymap-yh8xx_yh9xx.c +++ b/apps/keymaps/keymap-yh8xx_yh9xx.c | |||
@@ -96,7 +96,11 @@ 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 | ||
100 | { ACTION_WPS_HOTKEY, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT }, | ||
101 | #else | ||
99 | { ACTION_WPS_VIEW_PLAYLIST, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT }, | 102 | { ACTION_WPS_VIEW_PLAYLIST, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT }, |
103 | #endif | ||
100 | { ACTION_WPS_REC, BUTTON_REC|BUTTON_REPEAT, BUTTON_NONE }, | 104 | { ACTION_WPS_REC, BUTTON_REC|BUTTON_REPEAT, BUTTON_NONE }, |
101 | 105 | ||
102 | LAST_ITEM_IN_LIST | 106 | LAST_ITEM_IN_LIST |
@@ -117,6 +121,9 @@ static const struct button_mapping button_context_list[] = { | |||
117 | static const struct button_mapping button_context_tree[] = { | 121 | static const struct button_mapping button_context_tree[] = { |
118 | { ACTION_TREE_WPS, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, | 122 | { ACTION_TREE_WPS, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, |
119 | { ACTION_TREE_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, | 123 | { ACTION_TREE_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, |
124 | #ifdef HAVE_HOTKEY | ||
125 | // { ACTION_TREE_HOTKEY, BUTTON_NONE, BUTTON_NONE }, | ||
126 | #endif | ||
120 | 127 | ||
121 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST) | 128 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST) |
122 | }; /* button_context_tree */ | 129 | }; /* button_context_tree */ |