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

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[] =
     {PLA_SELECT_REL,        BUTTON_SELECT|BUTTON_REL,           BUTTON_SELECT },
     {PLA_SELECT_REPEAT,     BUTTON_SELECT|BUTTON_REPEAT,        BUTTON_NONE },
 #elif (CONFIG_KEYPAD == IAUDIO_X5M5_PAD)
-    {PLA_CANCEL,            BUTTON_POWER,                       BUTTON_NONE },
-    {PLA_EXIT,              BUTTON_PLAY|BUTTON_SELECT,          BUTTON_NONE },
+    {PLA_CANCEL,            BUTTON_REC,                         BUTTON_NONE },
+    {PLA_CANCEL,            BUTTON_RC_REC|BUTTON_REL,           BUTTON_RC_REC},
+    {PLA_EXIT,              BUTTON_POWER,                       BUTTON_NONE },
+    {PLA_EXIT,              BUTTON_RC_REC|BUTTON_REPEAT,        BUTTON_NONE },
     {PLA_SELECT,            BUTTON_SELECT,                      BUTTON_NONE },
     {PLA_SELECT,            BUTTON_RC_MODE,                     BUTTON_NONE },
     {PLA_SELECT_REL,        BUTTON_SELECT|BUTTON_REL,           BUTTON_SELECT },