Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix reds: add m3 keypad, fix typo in the ipods part, correct button for h10, don't error out for touchscreens (onda vx777 has almost no tactical buttons).

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26209 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Thomas Martitz 2010-05-20 19:05:24 +00:00
parent 2960052d28
commit 9d7d0b5af6
1 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
apps/plugins/lib/pluginlib_actions.c
View file

@ -41,6 +41,7 @@ const struct button_mapping pla_remote_ctx[] =
#elif (CONFIG_KEYPAD == IAUDIO_X5M5_PAD) || \ #elif (CONFIG_KEYPAD == IAUDIO_X5M5_PAD) || \
(CONFIG_KEYPAD == IRIVER_H10_PAD) || \ (CONFIG_KEYPAD == IRIVER_H10_PAD) || \
(CONFIG_KEYPAD == GIGABEAT_PAD) || \ (CONFIG_KEYPAD == GIGABEAT_PAD) || \
(CONFIG_KEYPAD == IAUDIO_M3_PAD) || \
(CONFIG_KEYPAD == GIGABEAT_S_PAD) (CONFIG_KEYPAD == GIGABEAT_S_PAD)
{ PLA_UP, BUTTON_RC_FF, BUTTON_NONE}, { PLA_UP, BUTTON_RC_FF, BUTTON_NONE},
{ PLA_DOWN, BUTTON_RC_REW, BUTTON_NONE}, { PLA_DOWN, BUTTON_RC_REW, BUTTON_NONE},
@ -128,7 +129,7 @@ const struct button_mapping pla_main_ctx[] =
|| (CONFIG_KEYPAD == IPOD_3G_PAD) \ || (CONFIG_KEYPAD == IPOD_3G_PAD) \
|| (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD)
{ PLA_UP, BUTTON_MENU, BUTTON_NONE }, { PLA_UP, BUTTON_MENU, BUTTON_NONE },
( PLA_DOWN, BUTTON_PLAY, BUTTON_NONE }, { PLA_DOWN, BUTTON_PLAY, BUTTON_NONE },
{ PLA_LEFT, BUTTON_LEFT, BUTTON_NONE }, { PLA_LEFT, BUTTON_LEFT, BUTTON_NONE },
{ PLA_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, { PLA_RIGHT, BUTTON_RIGHT, BUTTON_NONE },
{ PLA_UP_REPEAT, BUTTON_MENU|BUTTON_REPEAT, BUTTON_NONE }, { PLA_UP_REPEAT, BUTTON_MENU|BUTTON_REPEAT, BUTTON_NONE },
@ -153,6 +154,15 @@ const struct button_mapping pla_main_ctx[] =
{ PLA_DOWN_REPEAT, BUTTON_SCROLL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, { PLA_DOWN_REPEAT, BUTTON_SCROLL_DOWN|BUTTON_REPEAT, BUTTON_NONE },
{ PLA_LEFT_REPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, { PLA_LEFT_REPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
{ PLA_RIGHT_REPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, { PLA_RIGHT_REPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
#elif (CONFIG_KEYPAD == IAUDIO_M3_PAD)
{ PLA_UP, BUTTON_VOL_UP, BUTTON_NONE },
{ PLA_DOWN, BUTTON_VOL_DOWN, BUTTON_NONE },
{ PLA_LEFT, BUTTON_LEFT, BUTTON_NONE },
{ PLA_RIGHT, BUTTON_RIGHT, BUTTON_NONE },
{ PLA_UP_REPEAT, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE },
{ PLA_DOWN_REPEAT, BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE },
{ PLA_LEFT_REPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
{ PLA_RIGHT_REPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
#elif (CONFIG_KEYPAD == PHILIPS_SA9200_PAD) #elif (CONFIG_KEYPAD == PHILIPS_SA9200_PAD)
{ PLA_UP, BUTTON_UP, BUTTON_NONE }, { PLA_UP, BUTTON_UP, BUTTON_NONE },
{ PLA_DOWN, BUTTON_DOWN, BUTTON_NONE }, { PLA_DOWN, BUTTON_DOWN, BUTTON_NONE },
@ -189,11 +199,10 @@ const struct button_mapping pla_main_ctx[] =
{ PLA_DOWN_REPEAT, BUTTON_NEXT|BUTTON_REPEAT, BUTTON_NONE}, { PLA_DOWN_REPEAT, BUTTON_NEXT|BUTTON_REPEAT, BUTTON_NONE},
{ PLA_LEFT_REPEAT, BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE}, { PLA_LEFT_REPEAT, BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE},
{ PLA_RIGHT_REPEAT, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE}, { PLA_RIGHT_REPEAT, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE},
#else #else
#ifndef HAVE_TOUCHSCREEN # ifndef HAVE_TOUCHSCREEN
#error pluginlib_actions: No directions defined # error pluginlib_actions: No directions defined
#endif # endif
#endif #endif
/* Scrollwheels */ /* Scrollwheels */
@ -282,7 +291,7 @@ const struct button_mapping pla_main_ctx[] =
{PLA_SELECT_REL, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT}, {PLA_SELECT_REL, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT},
{PLA_SELECT_REPEAT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE}, {PLA_SELECT_REPEAT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE},
#elif (CONFIG_KEYPAD == IRIVER_H10_PAD) #elif (CONFIG_KEYPAD == IRIVER_H10_PAD)
{PLA_CANCEL, BUTTON_PREV, BUTTON_NONE}, {PLA_CANCEL, BUTTON_REW, BUTTON_NONE},
{PLA_EXIT, BUTTON_POWER, BUTTON_NONE}, {PLA_EXIT, BUTTON_POWER, BUTTON_NONE},
{PLA_SELECT, BUTTON_PLAY, BUTTON_NONE}, {PLA_SELECT, BUTTON_PLAY, BUTTON_NONE},
{PLA_SELECT_REL, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY}, {PLA_SELECT_REL, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY},
@ -354,7 +363,9 @@ const struct button_mapping pla_main_ctx[] =
{PLA_SELECT_REL, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT}, {PLA_SELECT_REL, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT},
{PLA_SELECT_REPEAT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE}, {PLA_SELECT_REPEAT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE},
#else #else
#error pluginlib_actions: No actions defined # ifndef HAVE_TOUCHSCREEN
# error pluginlib_actions: No actions defined
# endif
#endif #endif
LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_PLUGIN), LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_PLUGIN),
}; };