diff options
| author | Jens Arnold <amiconn@rockbox.org> | 2008-03-22 10:24:28 +0000 |
|---|---|---|
| committer | Jens Arnold <amiconn@rockbox.org> | 2008-03-22 10:24:28 +0000 |
| commit | 29361abf744ed116cec04ca03e754ddd2794b76c (patch) | |
| tree | d336dd19570faed037aef9064ce3c490c50ed6df /apps/plugins/lib | |
| parent | bca8edd856cee3a3b469ef9fe2770a191b590fde (diff) | |
| download | rockbox-29361abf744ed116cec04ca03e754ddd2794b76c.zip rockbox-29361abf744ed116cec04ca03e754ddd2794b76c.tar.gz rockbox-29361abf744ed116cec04ca03e754ddd2794b76c.tar.bz2 rockbox-29361abf744ed116cec04ca03e754ddd2794b76c.tar.xz | |
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
Diffstat (limited to 'apps/plugins/lib')
| -rw-r--r-- | apps/plugins/lib/SOURCES | 3 | ||||
| -rw-r--r-- | apps/plugins/lib/pluginlib_actions.c | 27 |
2 files changed, 29 insertions, 1 deletions
diff --git a/apps/plugins/lib/SOURCES b/apps/plugins/lib/SOURCES index 6a44c80..f1aded6 100644 --- a/apps/plugins/lib/SOURCES +++ b/apps/plugins/lib/SOURCES @@ -3,7 +3,8 @@ configfile.c fixedpoint.c playback_control.c rgb_hsv.c -#if defined(HAVE_LCD_BITMAP) && (LCD_DEPTH < 4) +#if defined(HAVE_LCD_BITMAP) && (LCD_DEPTH < 4) \ + && !defined(IAUDIO_M3) /* TODO: Test whether it can be implemented */ grey_core.c grey_draw.c grey_parm.c diff --git a/apps/plugins/lib/pluginlib_actions.c b/apps/plugins/lib/pluginlib_actions.c index a7fbb35..1cd1058 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 |