Adapt most single-file plugins to the M3 keypad and screen. It's still preliminary, as many plugins now can't be left without the remote. The plugins need to be converted to use the action API (but not pluginlib actions). Plugins are not enabled yet. * Simplify the bitmap handling in the source of some plugins.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16737 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 27 insertions, 0 deletions

diff --git a/apps/plugins/lib/pluginlib_actions.c b/apps/plugins/lib/pluginlib_actions.c
index a7fbb356e3..1cd10581e1 100644
--- a/apps/plugins/lib/pluginlib_actions.c
+++ b/apps/plugins/lib/pluginlib_actions.c
@@ -140,6 +140,15 @@ const struct button_mapping generic_directions[] =
     { PLA_DOWN_REPEAT,       BUTTON_DOWN|BUTTON_REPEAT,         BUTTON_NONE},
     { PLA_LEFT_REPEAT,       BUTTON_UP|BUTTON_REPEAT,           BUTTON_MENU},
     { PLA_RIGHT_REPEAT,      BUTTON_DOWN|BUTTON_REPEAT,         BUTTON_MENU},
+#elif CONFIG_KEYPAD == IAUDIO_M3_PAD
+    { PLA_UP,                BUTTON_RC_VOL_UP,                  BUTTON_NONE},
+    { PLA_DOWN,              BUTTON_RC_VOL_DOWN,                BUTTON_NONE},
+    { PLA_LEFT,              BUTTON_RC_REW,                     BUTTON_NONE},
+    { PLA_RIGHT,             BUTTON_RC_FF,                      BUTTON_NONE},
+    { PLA_UP_REPEAT,         BUTTON_RC_VOL_UP|BUTTON_REPEAT,    BUTTON_NONE},
+    { PLA_DOWN_REPEAT,       BUTTON_RC_VOL_DOWN|BUTTON_REPEAT,  BUTTON_NONE},
+    { PLA_LEFT_REPEAT,       BUTTON_RC_REW|BUTTON_REPEAT,       BUTTON_NONE},
+    { PLA_RIGHT_REPEAT,      BUTTON_RC_FF|BUTTON_REPEAT,        BUTTON_NONE},
 #else
     #error pluginlib_actions: Unsupported keypad
 #endif
@@ -227,6 +236,13 @@ const struct button_mapping generic_left_right_fire[] =
     { PLA_RIGHT_REPEAT,      BUTTON_DOWN|BUTTON_REPEAT,         BUTTON_NONE},
     { PLA_FIRE,              BUTTON_MENU,                       BUTTON_NONE},
     { PLA_FIRE_REPEAT,       BUTTON_MENU|BUTTON_REPEAT,         BUTTON_NONE},
+#elif CONFIG_KEYPAD == IAUDIO_M3_PAD
+    { PLA_LEFT,              BUTTON_RC_REW,                BUTTON_NONE},
+    { PLA_RIGHT,             BUTTON_RC_FF,                 BUTTON_NONE},
+    { PLA_LEFT_REPEAT,       BUTTON_RC_REW|BUTTON_REPEAT,  BUTTON_NONE},
+    { PLA_RIGHT_REPEAT,      BUTTON_RC_FF|BUTTON_REPEAT,   BUTTON_NONE},
+    { PLA_FIRE,              BUTTON_RC_MODE,               BUTTON_NONE},
+    { PLA_FIRE_REPEAT,       BUTTON_RC_MODE|BUTTON_REPEAT, BUTTON_NONE},
 #else
     #error pluginlib_actions: Unsupported keypad
 #endif
@@ -342,6 +358,12 @@ const struct button_mapping generic_actions[] =
     {PLA_MENU,          BUTTON_DOWN,                        BUTTON_NONE},
     {PLA_FIRE,          BUTTON_MENU,                        BUTTON_NONE},
     {PLA_FIRE_REPEAT,   BUTTON_MENU|BUTTON_REPEAT,          BUTTON_NONE},
+#elif CONFIG_KEYPAD == IAUDIO_M3_PAD
+    {PLA_QUIT,          BUTTON_RC_REC,                  BUTTON_NONE},
+    {PLA_START,         BUTTON_RC_PLAY,                 BUTTON_NONE},
+    {PLA_MENU,          BUTTON_RC_MENU,                 BUTTON_NONE},
+    {PLA_FIRE,          BUTTON_RC_MODE,                 BUTTON_NONE},
+    {PLA_FIRE_REPEAT,   BUTTON_RC_MODE|BUTTON_REPEAT,   BUTTON_NONE},
 #else
     #error pluginlib_actions: Unsupported keypad
 #endif
@@ -391,6 +413,11 @@ const struct button_mapping generic_increase_decrease[] =
     {PLA_DEC,             BUTTON_RC_DOWN,                    BUTTON_NONE},
     {PLA_INC_REPEAT,      BUTTON_RC_PLAY|BUTTON_REPEAT,      BUTTON_NONE},
     {PLA_DEC_REPEAT,      BUTTON_RC_DOWN|BUTTON_REPEAT,      BUTTON_NONE},
+#elif CONFIG_KEYPAD == IAUDIO_M3_PAD
+    {PLA_INC,             BUTTON_RC_VOL_UP,                  BUTTON_NONE},
+    {PLA_DEC,             BUTTON_RC_VOL_DOWN,                BUTTON_NONE},
+    {PLA_INC_REPEAT,      BUTTON_RC_VOL_UP|BUTTON_REPEAT,    BUTTON_NONE},
+    {PLA_DEC_REPEAT,      BUTTON_RC_VOL_DOWN|BUTTON_REPEAT,  BUTTON_NONE},
 #else
 #error pluginlib_actions: Unsupported keypad
 #endif