diff options
-rw-r--r-- | apps/plugins/lib/pluginlib_actions.c | 25 |
1 files changed, 18 insertions, 7 deletions
diff --git a/apps/plugins/lib/pluginlib_actions.c b/apps/plugins/lib/pluginlib_actions.c index b68c390aae..45baa323c7 100644 --- a/apps/plugins/lib/pluginlib_actions.c +++ b/apps/plugins/lib/pluginlib_actions.c | |||
@@ -41,6 +41,7 @@ const struct button_mapping pla_remote_ctx[] = | |||
41 | #elif (CONFIG_KEYPAD == IAUDIO_X5M5_PAD) || \ | 41 | #elif (CONFIG_KEYPAD == IAUDIO_X5M5_PAD) || \ |
42 | (CONFIG_KEYPAD == IRIVER_H10_PAD) || \ | 42 | (CONFIG_KEYPAD == IRIVER_H10_PAD) || \ |
43 | (CONFIG_KEYPAD == GIGABEAT_PAD) || \ | 43 | (CONFIG_KEYPAD == GIGABEAT_PAD) || \ |
44 | (CONFIG_KEYPAD == IAUDIO_M3_PAD) || \ | ||
44 | (CONFIG_KEYPAD == GIGABEAT_S_PAD) | 45 | (CONFIG_KEYPAD == GIGABEAT_S_PAD) |
45 | { PLA_UP, BUTTON_RC_FF, BUTTON_NONE}, | 46 | { PLA_UP, BUTTON_RC_FF, BUTTON_NONE}, |
46 | { PLA_DOWN, BUTTON_RC_REW, BUTTON_NONE}, | 47 | { PLA_DOWN, BUTTON_RC_REW, BUTTON_NONE}, |
@@ -128,7 +129,7 @@ const struct button_mapping pla_main_ctx[] = | |||
128 | || (CONFIG_KEYPAD == IPOD_3G_PAD) \ | 129 | || (CONFIG_KEYPAD == IPOD_3G_PAD) \ |
129 | || (CONFIG_KEYPAD == IPOD_4G_PAD) | 130 | || (CONFIG_KEYPAD == IPOD_4G_PAD) |
130 | { PLA_UP, BUTTON_MENU, BUTTON_NONE }, | 131 | { PLA_UP, BUTTON_MENU, BUTTON_NONE }, |
131 | ( PLA_DOWN, BUTTON_PLAY, BUTTON_NONE }, | 132 | { PLA_DOWN, BUTTON_PLAY, BUTTON_NONE }, |
132 | { PLA_LEFT, BUTTON_LEFT, BUTTON_NONE }, | 133 | { PLA_LEFT, BUTTON_LEFT, BUTTON_NONE }, |
133 | { PLA_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, | 134 | { PLA_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, |
134 | { PLA_UP_REPEAT, BUTTON_MENU|BUTTON_REPEAT, BUTTON_NONE }, | 135 | { PLA_UP_REPEAT, BUTTON_MENU|BUTTON_REPEAT, BUTTON_NONE }, |
@@ -153,6 +154,15 @@ const struct button_mapping pla_main_ctx[] = | |||
153 | { PLA_DOWN_REPEAT, BUTTON_SCROLL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 154 | { PLA_DOWN_REPEAT, BUTTON_SCROLL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
154 | { PLA_LEFT_REPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | 155 | { PLA_LEFT_REPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, |
155 | { PLA_RIGHT_REPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | 156 | { PLA_RIGHT_REPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, |
157 | #elif (CONFIG_KEYPAD == IAUDIO_M3_PAD) | ||
158 | { PLA_UP, BUTTON_VOL_UP, BUTTON_NONE }, | ||
159 | { PLA_DOWN, BUTTON_VOL_DOWN, BUTTON_NONE }, | ||
160 | { PLA_LEFT, BUTTON_LEFT, BUTTON_NONE }, | ||
161 | { PLA_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, | ||
162 | { PLA_UP_REPEAT, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, | ||
163 | { PLA_DOWN_REPEAT, BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | ||
164 | { PLA_LEFT_REPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | ||
165 | { PLA_RIGHT_REPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | ||
156 | #elif (CONFIG_KEYPAD == PHILIPS_SA9200_PAD) | 166 | #elif (CONFIG_KEYPAD == PHILIPS_SA9200_PAD) |
157 | { PLA_UP, BUTTON_UP, BUTTON_NONE }, | 167 | { PLA_UP, BUTTON_UP, BUTTON_NONE }, |
158 | { PLA_DOWN, BUTTON_DOWN, BUTTON_NONE }, | 168 | { PLA_DOWN, BUTTON_DOWN, BUTTON_NONE }, |
@@ -189,11 +199,10 @@ const struct button_mapping pla_main_ctx[] = | |||
189 | { PLA_DOWN_REPEAT, BUTTON_NEXT|BUTTON_REPEAT, BUTTON_NONE}, | 199 | { PLA_DOWN_REPEAT, BUTTON_NEXT|BUTTON_REPEAT, BUTTON_NONE}, |
190 | { PLA_LEFT_REPEAT, BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE}, | 200 | { PLA_LEFT_REPEAT, BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE}, |
191 | { PLA_RIGHT_REPEAT, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE}, | 201 | { PLA_RIGHT_REPEAT, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE}, |
192 | |||
193 | #else | 202 | #else |
194 | #ifndef HAVE_TOUCHSCREEN | 203 | # ifndef HAVE_TOUCHSCREEN |
195 | #error pluginlib_actions: No directions defined | 204 | # error pluginlib_actions: No directions defined |
196 | #endif | 205 | # endif |
197 | #endif | 206 | #endif |
198 | 207 | ||
199 | /* Scrollwheels */ | 208 | /* Scrollwheels */ |
@@ -282,7 +291,7 @@ const struct button_mapping pla_main_ctx[] = | |||
282 | {PLA_SELECT_REL, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT}, | 291 | {PLA_SELECT_REL, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT}, |
283 | {PLA_SELECT_REPEAT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE}, | 292 | {PLA_SELECT_REPEAT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE}, |
284 | #elif (CONFIG_KEYPAD == IRIVER_H10_PAD) | 293 | #elif (CONFIG_KEYPAD == IRIVER_H10_PAD) |
285 | {PLA_CANCEL, BUTTON_PREV, BUTTON_NONE}, | 294 | {PLA_CANCEL, BUTTON_REW, BUTTON_NONE}, |
286 | {PLA_EXIT, BUTTON_POWER, BUTTON_NONE}, | 295 | {PLA_EXIT, BUTTON_POWER, BUTTON_NONE}, |
287 | {PLA_SELECT, BUTTON_PLAY, BUTTON_NONE}, | 296 | {PLA_SELECT, BUTTON_PLAY, BUTTON_NONE}, |
288 | {PLA_SELECT_REL, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY}, | 297 | {PLA_SELECT_REL, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY}, |
@@ -354,7 +363,9 @@ const struct button_mapping pla_main_ctx[] = | |||
354 | {PLA_SELECT_REL, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT}, | 363 | {PLA_SELECT_REL, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT}, |
355 | {PLA_SELECT_REPEAT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE}, | 364 | {PLA_SELECT_REPEAT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE}, |
356 | #else | 365 | #else |
357 | #error pluginlib_actions: No actions defined | 366 | # ifndef HAVE_TOUCHSCREEN |
367 | # error pluginlib_actions: No actions defined | ||
368 | # endif | ||
358 | #endif | 369 | #endif |
359 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_PLUGIN), | 370 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_PLUGIN), |
360 | }; | 371 | }; |