diff options
author | Marianne Arnold <pixelma@rockbox.org> | 2010-06-05 16:21:34 +0000 |
---|---|---|
committer | Marianne Arnold <pixelma@rockbox.org> | 2010-06-05 16:21:34 +0000 |
commit | 15935a6b755ced07a9f0dfc15a372e3a62b3859f (patch) | |
tree | 8a696039896849d3c4f9cda33797bee0fcb59f31 /apps/plugins/lib/pluginlib_actions.c | |
parent | aeb5618ae4b14004e588f875220b13b19f09bf8c (diff) | |
download | rockbox-15935a6b755ced07a9f0dfc15a372e3a62b3859f.tar.gz rockbox-15935a6b755ced07a9f0dfc15a372e3a62b3859f.zip |
Fix PLA_EXIT and PLA_CANCEL for the Iaudio M5 and X5, make them more intuitive and add the missing remote actions for it at the same time.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26587 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins/lib/pluginlib_actions.c')
-rw-r--r-- | apps/plugins/lib/pluginlib_actions.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/apps/plugins/lib/pluginlib_actions.c b/apps/plugins/lib/pluginlib_actions.c index 1872a5702b..f31fe74237 100644 --- a/apps/plugins/lib/pluginlib_actions.c +++ b/apps/plugins/lib/pluginlib_actions.c | |||
@@ -233,8 +233,10 @@ const struct button_mapping pla_main_ctx[] = | |||
233 | {PLA_SELECT_REL, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, | 233 | {PLA_SELECT_REL, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, |
234 | {PLA_SELECT_REPEAT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE }, | 234 | {PLA_SELECT_REPEAT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE }, |
235 | #elif (CONFIG_KEYPAD == IAUDIO_X5M5_PAD) | 235 | #elif (CONFIG_KEYPAD == IAUDIO_X5M5_PAD) |
236 | {PLA_CANCEL, BUTTON_POWER, BUTTON_NONE }, | 236 | {PLA_CANCEL, BUTTON_REC, BUTTON_NONE }, |
237 | {PLA_EXIT, BUTTON_PLAY|BUTTON_SELECT, BUTTON_NONE }, | 237 | {PLA_CANCEL, BUTTON_RC_REC|BUTTON_REL, BUTTON_RC_REC}, |
238 | {PLA_EXIT, BUTTON_POWER, BUTTON_NONE }, | ||
239 | {PLA_EXIT, BUTTON_RC_REC|BUTTON_REPEAT, BUTTON_NONE }, | ||
238 | {PLA_SELECT, BUTTON_SELECT, BUTTON_NONE }, | 240 | {PLA_SELECT, BUTTON_SELECT, BUTTON_NONE }, |
239 | {PLA_SELECT, BUTTON_RC_MODE, BUTTON_NONE }, | 241 | {PLA_SELECT, BUTTON_RC_MODE, BUTTON_NONE }, |
240 | {PLA_SELECT_REL, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, | 242 | {PLA_SELECT_REL, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, |