diff options
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 6a44c80ffa..f1aded6122 100644 --- a/apps/plugins/lib/SOURCES +++ b/apps/plugins/lib/SOURCES | |||
@@ -3,7 +3,8 @@ configfile.c | |||
3 | fixedpoint.c | 3 | fixedpoint.c |
4 | playback_control.c | 4 | playback_control.c |
5 | rgb_hsv.c | 5 | rgb_hsv.c |
6 | #if defined(HAVE_LCD_BITMAP) && (LCD_DEPTH < 4) | 6 | #if defined(HAVE_LCD_BITMAP) && (LCD_DEPTH < 4) \ |
7 | && !defined(IAUDIO_M3) /* TODO: Test whether it can be implemented */ | ||
7 | grey_core.c | 8 | grey_core.c |
8 | grey_draw.c | 9 | grey_draw.c |
9 | grey_parm.c | 10 | grey_parm.c |
diff --git a/apps/plugins/lib/pluginlib_actions.c b/apps/plugins/lib/pluginlib_actions.c index a7fbb356e3..1cd10581e1 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[] = | |||
140 | { PLA_DOWN_REPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE}, | 140 | { PLA_DOWN_REPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE}, |
141 | { PLA_LEFT_REPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_MENU}, | 141 | { PLA_LEFT_REPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_MENU}, |
142 | { PLA_RIGHT_REPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_MENU}, | 142 | { PLA_RIGHT_REPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_MENU}, |
143 | #elif CONFIG_KEYPAD == IAUDIO_M3_PAD | ||
144 | { PLA_UP, BUTTON_RC_VOL_UP, BUTTON_NONE}, | ||
145 | { PLA_DOWN, BUTTON_RC_VOL_DOWN, BUTTON_NONE}, | ||
146 | { PLA_LEFT, BUTTON_RC_REW, BUTTON_NONE}, | ||
147 | { PLA_RIGHT, BUTTON_RC_FF, BUTTON_NONE}, | ||
148 | { PLA_UP_REPEAT, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE}, | ||
149 | { PLA_DOWN_REPEAT, BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE}, | ||
150 | { PLA_LEFT_REPEAT, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_NONE}, | ||
151 | { PLA_RIGHT_REPEAT, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_NONE}, | ||
143 | #else | 152 | #else |
144 | #error pluginlib_actions: Unsupported keypad | 153 | #error pluginlib_actions: Unsupported keypad |
145 | #endif | 154 | #endif |
@@ -227,6 +236,13 @@ const struct button_mapping generic_left_right_fire[] = | |||
227 | { PLA_RIGHT_REPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE}, | 236 | { PLA_RIGHT_REPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE}, |
228 | { PLA_FIRE, BUTTON_MENU, BUTTON_NONE}, | 237 | { PLA_FIRE, BUTTON_MENU, BUTTON_NONE}, |
229 | { PLA_FIRE_REPEAT, BUTTON_MENU|BUTTON_REPEAT, BUTTON_NONE}, | 238 | { PLA_FIRE_REPEAT, BUTTON_MENU|BUTTON_REPEAT, BUTTON_NONE}, |
239 | #elif CONFIG_KEYPAD == IAUDIO_M3_PAD | ||
240 | { PLA_LEFT, BUTTON_RC_REW, BUTTON_NONE}, | ||
241 | { PLA_RIGHT, BUTTON_RC_FF, BUTTON_NONE}, | ||
242 | { PLA_LEFT_REPEAT, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_NONE}, | ||
243 | { PLA_RIGHT_REPEAT, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_NONE}, | ||
244 | { PLA_FIRE, BUTTON_RC_MODE, BUTTON_NONE}, | ||
245 | { PLA_FIRE_REPEAT, BUTTON_RC_MODE|BUTTON_REPEAT, BUTTON_NONE}, | ||
230 | #else | 246 | #else |
231 | #error pluginlib_actions: Unsupported keypad | 247 | #error pluginlib_actions: Unsupported keypad |
232 | #endif | 248 | #endif |
@@ -342,6 +358,12 @@ const struct button_mapping generic_actions[] = | |||
342 | {PLA_MENU, BUTTON_DOWN, BUTTON_NONE}, | 358 | {PLA_MENU, BUTTON_DOWN, BUTTON_NONE}, |
343 | {PLA_FIRE, BUTTON_MENU, BUTTON_NONE}, | 359 | {PLA_FIRE, BUTTON_MENU, BUTTON_NONE}, |
344 | {PLA_FIRE_REPEAT, BUTTON_MENU|BUTTON_REPEAT, BUTTON_NONE}, | 360 | {PLA_FIRE_REPEAT, BUTTON_MENU|BUTTON_REPEAT, BUTTON_NONE}, |
361 | #elif CONFIG_KEYPAD == IAUDIO_M3_PAD | ||
362 | {PLA_QUIT, BUTTON_RC_REC, BUTTON_NONE}, | ||
363 | {PLA_START, BUTTON_RC_PLAY, BUTTON_NONE}, | ||
364 | {PLA_MENU, BUTTON_RC_MENU, BUTTON_NONE}, | ||
365 | {PLA_FIRE, BUTTON_RC_MODE, BUTTON_NONE}, | ||
366 | {PLA_FIRE_REPEAT, BUTTON_RC_MODE|BUTTON_REPEAT, BUTTON_NONE}, | ||
345 | #else | 367 | #else |
346 | #error pluginlib_actions: Unsupported keypad | 368 | #error pluginlib_actions: Unsupported keypad |
347 | #endif | 369 | #endif |
@@ -391,6 +413,11 @@ const struct button_mapping generic_increase_decrease[] = | |||
391 | {PLA_DEC, BUTTON_RC_DOWN, BUTTON_NONE}, | 413 | {PLA_DEC, BUTTON_RC_DOWN, BUTTON_NONE}, |
392 | {PLA_INC_REPEAT, BUTTON_RC_PLAY|BUTTON_REPEAT, BUTTON_NONE}, | 414 | {PLA_INC_REPEAT, BUTTON_RC_PLAY|BUTTON_REPEAT, BUTTON_NONE}, |
393 | {PLA_DEC_REPEAT, BUTTON_RC_DOWN|BUTTON_REPEAT, BUTTON_NONE}, | 415 | {PLA_DEC_REPEAT, BUTTON_RC_DOWN|BUTTON_REPEAT, BUTTON_NONE}, |
416 | #elif CONFIG_KEYPAD == IAUDIO_M3_PAD | ||
417 | {PLA_INC, BUTTON_RC_VOL_UP, BUTTON_NONE}, | ||
418 | {PLA_DEC, BUTTON_RC_VOL_DOWN, BUTTON_NONE}, | ||
419 | {PLA_INC_REPEAT, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE}, | ||
420 | {PLA_DEC_REPEAT, BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE}, | ||
394 | #else | 421 | #else |
395 | #error pluginlib_actions: Unsupported keypad | 422 | #error pluginlib_actions: Unsupported keypad |
396 | #endif | 423 | #endif |