diff options
| author | Jonathan Gordon <rockbox@jdgordon.info> | 2008-01-10 08:08:31 +0000 |
|---|---|---|
| committer | Jonathan Gordon <rockbox@jdgordon.info> | 2008-01-10 08:08:31 +0000 |
| commit | 81ba146706e0a1c21c59f11022767577be7d71b2 (patch) | |
| tree | afce479f5133dcfaaaa71b2aa47a2e4f7c1004f3 /apps/plugins/lib | |
| parent | 4d238c14d70199e3a991db0c3b938eb4b0f6c93a (diff) | |
| download | rockbox-81ba146706e0a1c21c59f11022767577be7d71b2.tar.gz rockbox-81ba146706e0a1c21c59f11022767577be7d71b2.zip | |
Accept FS#8341 - rename BUTTON_SCROLL_UP/DOWN to FWD/BACK on the e200 to make it consistant with the ipods. apart from removing a bit of confusion, it fixes the wheel in pictureflow and possibly elsewhere.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16045 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins/lib')
| -rw-r--r-- | apps/plugins/lib/pluginlib_actions.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/apps/plugins/lib/pluginlib_actions.c b/apps/plugins/lib/pluginlib_actions.c index 1063c245a4..baf7440397 100644 --- a/apps/plugins/lib/pluginlib_actions.c +++ b/apps/plugins/lib/pluginlib_actions.c | |||
| @@ -83,13 +83,14 @@ const struct button_mapping generic_directions[] = | |||
| 83 | { PLA_RIGHT_REPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE}, | 83 | { PLA_RIGHT_REPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE}, |
| 84 | #elif (CONFIG_KEYPAD == IPOD_1G2G_PAD) \ | 84 | #elif (CONFIG_KEYPAD == IPOD_1G2G_PAD) \ |
| 85 | || (CONFIG_KEYPAD == IPOD_3G_PAD) \ | 85 | || (CONFIG_KEYPAD == IPOD_3G_PAD) \ |
| 86 | || (CONFIG_KEYPAD == SANSA_E200_PAD) \ | ||
| 86 | || (CONFIG_KEYPAD == IPOD_4G_PAD) | 87 | || (CONFIG_KEYPAD == IPOD_4G_PAD) |
| 87 | { PLA_UP, BUTTON_SCROLL_FWD, BUTTON_NONE}, | 88 | { PLA_UP, BUTTON_SCROLL_BACK, BUTTON_NONE}, |
| 88 | { PLA_DOWN, BUTTON_SCROLL_BACK, BUTTON_NONE}, | 89 | { PLA_DOWN, BUTTON_SCROLL_FWD, BUTTON_NONE}, |
| 89 | { PLA_LEFT, BUTTON_LEFT, BUTTON_NONE}, | 90 | { PLA_LEFT, BUTTON_LEFT, BUTTON_NONE}, |
| 90 | { PLA_RIGHT, BUTTON_RIGHT, BUTTON_NONE}, | 91 | { PLA_RIGHT, BUTTON_RIGHT, BUTTON_NONE}, |
| 91 | { PLA_UP_REPEAT, BUTTON_SCROLL_FWD|BUTTON_REPEAT, BUTTON_NONE}, | 92 | { PLA_UP_REPEAT, BUTTON_SCROLL_BACK|BUTTON_REPEAT, BUTTON_NONE}, |
| 92 | { PLA_DOWN_REPEAT, BUTTON_SCROLL_BACK|BUTTON_REPEAT, BUTTON_NONE}, | 93 | { PLA_DOWN_REPEAT, BUTTON_SCROLL_FWD|BUTTON_REPEAT, BUTTON_NONE}, |
| 93 | { PLA_LEFT_REPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE}, | 94 | { PLA_LEFT_REPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE}, |
| 94 | { PLA_RIGHT_REPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE}, | 95 | { PLA_RIGHT_REPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE}, |
| 95 | #elif CONFIG_KEYPAD == ONDIO_PAD | 96 | #elif CONFIG_KEYPAD == ONDIO_PAD |
| @@ -110,8 +111,7 @@ const struct button_mapping generic_directions[] = | |||
| 110 | {PLA_DOWN_REPEAT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE}, | 111 | {PLA_DOWN_REPEAT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE}, |
| 111 | {PLA_LEFT_REPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE}, | 112 | {PLA_LEFT_REPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE}, |
| 112 | {PLA_RIGHT_REPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE}, | 113 | {PLA_RIGHT_REPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE}, |
| 113 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) \ | 114 | #elif (CONFIG_KEYPAD == IRIVER_H10_PAD) |
| 114 | || (CONFIG_KEYPAD == IRIVER_H10_PAD) | ||
| 115 | { PLA_UP, BUTTON_SCROLL_UP, BUTTON_NONE}, | 115 | { PLA_UP, BUTTON_SCROLL_UP, BUTTON_NONE}, |
| 116 | { PLA_DOWN, BUTTON_SCROLL_DOWN, BUTTON_NONE}, | 116 | { PLA_DOWN, BUTTON_SCROLL_DOWN, BUTTON_NONE}, |
| 117 | { PLA_LEFT, BUTTON_LEFT, BUTTON_NONE}, | 117 | { PLA_LEFT, BUTTON_LEFT, BUTTON_NONE}, |