diff options
author | Solomon Peachy <pizza@shaftnet.org> | 2020-10-05 18:44:16 -0400 |
---|---|---|
committer | Solomon Peachy <pizza@shaftnet.org> | 2020-10-05 22:54:52 +0000 |
commit | c6f66cf696a4a0802dad8128dd985c7ab6489602 (patch) | |
tree | c55cd76019121536270d40deefe6386cc30e57dd | |
parent | ef34126913978c7cd6e5b0831f78ac8355f053f0 (diff) | |
download | rockbox-c6f66cf696a4a0802dad8128dd985c7ab6489602.tar.gz rockbox-c6f66cf696a4a0802dad8128dd985c7ab6489602.zip |
agptekrocker: Rework WPS keymap a bit; replace direct pitchscreen access with browse
Change-Id: If5cb1e1fae6ed74397cd7f56cd54c14224a4bab0
-rw-r--r-- | apps/keymaps/keymap-agptekrocker.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/apps/keymaps/keymap-agptekrocker.c b/apps/keymaps/keymap-agptekrocker.c index 1c13239bea..b27cb886b9 100644 --- a/apps/keymaps/keymap-agptekrocker.c +++ b/apps/keymaps/keymap-agptekrocker.c | |||
@@ -25,11 +25,11 @@ | |||
25 | 25 | ||
26 | /* {Action Code, Button code, Prereq button code } */ | 26 | /* {Action Code, Button code, Prereq button code } */ |
27 | 27 | ||
28 | /* | 28 | /* |
29 | * The format of the list is as follows | 29 | * The format of the list is as follows |
30 | * { Action Code, Button code, Prereq button code } | 30 | * { Action Code, Button code, Prereq button code } |
31 | * if there's no need to check the previous button's value, use BUTTON_NONE | 31 | * if there's no need to check the previous button's value, use BUTTON_NONE |
32 | * Insert LAST_ITEM_IN_LIST at the end of each mapping | 32 | * Insert LAST_ITEM_IN_LIST at the end of each mapping |
33 | */ | 33 | */ |
34 | static const struct button_mapping button_context_standard[] = { | 34 | static const struct button_mapping button_context_standard[] = { |
35 | { ACTION_STD_PREV, BUTTON_UP, BUTTON_NONE }, | 35 | { ACTION_STD_PREV, BUTTON_UP, BUTTON_NONE }, |
@@ -61,7 +61,6 @@ static const struct button_mapping button_context_mainmenu[] = { | |||
61 | }; /* button_context_mainmenu as with sansa clip mapping - "back" button returns you to WPS */ | 61 | }; /* button_context_mainmenu as with sansa clip mapping - "back" button returns you to WPS */ |
62 | 62 | ||
63 | static const struct button_mapping button_context_wps[] = { | 63 | static const struct button_mapping button_context_wps[] = { |
64 | /* { ACTION_WPS_BROWSE, BUTTON_UP|BUTTON_REPEAT, BUTTON_UP }, */ | ||
65 | { ACTION_WPS_PLAY, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, | 64 | { ACTION_WPS_PLAY, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, |
66 | { ACTION_WPS_SEEKBACK, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | 65 | { ACTION_WPS_SEEKBACK, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, |
67 | { ACTION_WPS_SEEKFWD, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | 66 | { ACTION_WPS_SEEKFWD, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, |
@@ -74,7 +73,7 @@ static const struct button_mapping button_context_wps[] = { | |||
74 | { ACTION_WPS_VOLDOWN, BUTTON_VOLDOWN|BUTTON_REPEAT, BUTTON_NONE }, | 73 | { ACTION_WPS_VOLDOWN, BUTTON_VOLDOWN|BUTTON_REPEAT, BUTTON_NONE }, |
75 | { ACTION_WPS_VOLUP, BUTTON_VOLUP, BUTTON_NONE }, | 74 | { ACTION_WPS_VOLUP, BUTTON_VOLUP, BUTTON_NONE }, |
76 | { ACTION_WPS_VOLUP, BUTTON_VOLUP|BUTTON_REPEAT, BUTTON_NONE }, | 75 | { ACTION_WPS_VOLUP, BUTTON_VOLUP|BUTTON_REPEAT, BUTTON_NONE }, |
77 | { ACTION_WPS_PITCHSCREEN, BUTTON_UP|BUTTON_REPEAT, BUTTON_UP }, | 76 | { ACTION_WPS_BROWSE, BUTTON_UP|BUTTON_REPEAT, BUTTON_UP }, |
78 | /* ACTION_WPS_ID3SCREEN optional */ | 77 | /* ACTION_WPS_ID3SCREEN optional */ |
79 | { ACTION_WPS_CONTEXT, BUTTON_DOWN|BUTTON_REL, BUTTON_DOWN }, | 78 | { ACTION_WPS_CONTEXT, BUTTON_DOWN|BUTTON_REL, BUTTON_DOWN }, |
80 | { ACTION_WPS_QUICKSCREEN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_DOWN }, | 79 | { ACTION_WPS_QUICKSCREEN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_DOWN }, |
@@ -182,7 +181,7 @@ static const struct button_mapping button_context_pitchscreen[] = { | |||
182 | { ACTION_PS_EXIT, BUTTON_POWER, BUTTON_NONE }, | 181 | { ACTION_PS_EXIT, BUTTON_POWER, BUTTON_NONE }, |
183 | { ACTION_PS_SLOWER, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | 182 | { ACTION_PS_SLOWER, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, |
184 | { ACTION_PS_FASTER, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | 183 | { ACTION_PS_FASTER, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, |
185 | 184 | ||
186 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD), | 185 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD), |
187 | }; /* button_context_pitchscreen */ | 186 | }; /* button_context_pitchscreen */ |
188 | 187 | ||
@@ -224,7 +223,7 @@ const struct button_mapping* get_context_mapping(int context) | |||
224 | { | 223 | { |
225 | case CONTEXT_STD: | 224 | case CONTEXT_STD: |
226 | return button_context_standard; | 225 | return button_context_standard; |
227 | 226 | ||
228 | case CONTEXT_WPS: | 227 | case CONTEXT_WPS: |
229 | return button_context_wps; | 228 | return button_context_wps; |
230 | 229 | ||
@@ -259,6 +258,6 @@ const struct button_mapping* get_context_mapping(int context) | |||
259 | 258 | ||
260 | default: | 259 | default: |
261 | return button_context_standard; | 260 | return button_context_standard; |
262 | } | 261 | } |
263 | return button_context_standard; | 262 | return button_context_standard; |
264 | } | 263 | } |