summaryrefslogtreecommitdiff
path: root/apps/plugins/lib
diff options
context:
space:
mode:
authorJonathan Gordon <rockbox@jdgordon.info>2008-04-15 11:00:38 +0000
committerJonathan Gordon <rockbox@jdgordon.info>2008-04-15 11:00:38 +0000
commit970cfee39422a64f425e7af7d290fa6c92103ec9 (patch)
tree7eee07e0f0585a41b25fa070e0f6d9fb8eb7aeb7 /apps/plugins/lib
parent5b5a626bb6ba54ccdcd90741cea5f9cbd0f79553 (diff)
downloadrockbox-970cfee39422a64f425e7af7d290fa6c92103ec9.zip
rockbox-970cfee39422a64f425e7af7d290fa6c92103ec9.tar.gz
rockbox-970cfee39422a64f425e7af7d290fa6c92103ec9.tar.bz2
rockbox-970cfee39422a64f425e7af7d290fa6c92103ec9.tar.xz
woops... fix red and some svn keywords.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17115 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins/lib')
-rw-r--r--apps/plugins/lib/pluginlib_actions.c15
1 files changed, 12 insertions, 3 deletions
diff --git a/apps/plugins/lib/pluginlib_actions.c b/apps/plugins/lib/pluginlib_actions.c
index 1cd1058..7025120 100644
--- a/apps/plugins/lib/pluginlib_actions.c
+++ b/apps/plugins/lib/pluginlib_actions.c
@@ -132,6 +132,8 @@ const struct button_mapping generic_directions[] =
{ PLA_LEFT_REPEAT, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_NONE},
{ PLA_RIGHT_REPEAT, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_NONE},
#elif (CONFIG_KEYPAD == COWOND2_PAD)
+#warning pluginlib_action needs working keymaps for the d2
+ /* Needs Fxing
{ PLA_UP, BUTTON_UP, BUTTON_NONE},
{ PLA_DOWN, BUTTON_DOWN, BUTTON_NONE},
{ PLA_LEFT, BUTTON_UP, BUTTON_MENU},
@@ -140,6 +142,7 @@ 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},
@@ -230,12 +233,14 @@ const struct button_mapping generic_left_right_fire[] =
{ PLA_FIRE, BUTTON_RC_HEART, BUTTON_NONE},
{ PLA_FIRE_REPEAT, BUTTON_RC_HEART|BUTTON_REPEAT, BUTTON_NONE},
#elif (CONFIG_KEYPAD == COWOND2_PAD)
+ /* Needs fixing
{ PLA_LEFT, BUTTON_UP, BUTTON_NONE},
{ PLA_RIGHT, BUTTON_DOWN, BUTTON_NONE},
{ PLA_LEFT_REPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE},
{ 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},
@@ -354,8 +359,8 @@ const struct button_mapping generic_actions[] =
{PLA_FIRE_REPEAT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE},
#elif (CONFIG_KEYPAD == COWOND2_PAD)
{PLA_QUIT, BUTTON_POWER, BUTTON_NONE},
- {PLA_START, BUTTON_UP, BUTTON_NONE},
- {PLA_MENU, BUTTON_DOWN, BUTTON_NONE},
+ {PLA_START, BUTTON_MINUS, BUTTON_NONE},
+ {PLA_MENU, BUTTON_PLUS, BUTTON_NONE},
{PLA_FIRE, BUTTON_MENU, BUTTON_NONE},
{PLA_FIRE_REPEAT, BUTTON_MENU|BUTTON_REPEAT, BUTTON_NONE},
#elif CONFIG_KEYPAD == IAUDIO_M3_PAD
@@ -380,7 +385,6 @@ const struct button_mapping generic_increase_decrease[] =
|| (CONFIG_KEYPAD == ARCHOS_AV300_PAD) \
|| (CONFIG_KEYPAD == IRIVER_IFP7XX_PAD) \
|| (CONFIG_KEYPAD == ONDIO_PAD) \
- || (CONFIG_KEYPAD == COWOND2_PAD) \
|| (CONFIG_KEYPAD == GIGABEAT_S_PAD) \
|| (CONFIG_KEYPAD == MROBE100_PAD)
{PLA_INC, BUTTON_UP, BUTTON_NONE},
@@ -418,6 +422,11 @@ const struct button_mapping generic_increase_decrease[] =
{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},
+#elif CONFIG_KEYPAD == COWOND2_PAD
+ {PLA_INC, BUTTON_PLUS, BUTTON_NONE},
+ {PLA_DEC, BUTTON_MINUS, BUTTON_NONE},
+ {PLA_INC_REPEAT, BUTTON_PLUS|BUTTON_REPEAT, BUTTON_NONE},
+ {PLA_DEC_REPEAT, BUTTON_MINUS|BUTTON_REPEAT, BUTTON_NONE},
#else
#error pluginlib_actions: Unsupported keypad
#endif