diff options
Diffstat (limited to 'apps/plugins/lib/pluginlib_actions.c')
-rw-r--r-- | apps/plugins/lib/pluginlib_actions.c | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/apps/plugins/lib/pluginlib_actions.c b/apps/plugins/lib/pluginlib_actions.c index 480dc446cb..4d2a08cf47 100644 --- a/apps/plugins/lib/pluginlib_actions.c +++ b/apps/plugins/lib/pluginlib_actions.c | |||
@@ -68,7 +68,7 @@ const struct button_mapping pla_remote_ctx[] = | |||
68 | #endif /* HAVE_REMOTE_LCD */ | 68 | #endif /* HAVE_REMOTE_LCD */ |
69 | 69 | ||
70 | /* these were taken from the bubbles plugin, so may need tweaking */ | 70 | /* these were taken from the bubbles plugin, so may need tweaking */ |
71 | const struct button_mapping pla_main_ctx[] = | 71 | const struct button_mapping pla_main_ctx[] = |
72 | { | 72 | { |
73 | /* Touchscreens */ | 73 | /* Touchscreens */ |
74 | #ifdef HAVE_TOUCHSCREEN | 74 | #ifdef HAVE_TOUCHSCREEN |
@@ -242,6 +242,15 @@ const struct button_mapping pla_main_ctx[] = | |||
242 | { PLA_DOWN_REPEAT, BUTTON_OPTION|BUTTON_REPEAT, BUTTON_NONE }, | 242 | { PLA_DOWN_REPEAT, BUTTON_OPTION|BUTTON_REPEAT, BUTTON_NONE }, |
243 | { PLA_LEFT_REPEAT, BUTTON_PREV|BUTTON_REPEAT, BUTTON_NONE }, | 243 | { PLA_LEFT_REPEAT, BUTTON_PREV|BUTTON_REPEAT, BUTTON_NONE }, |
244 | { PLA_RIGHT_REPEAT, BUTTON_NEXT|BUTTON_REPEAT, BUTTON_NONE }, | 244 | { PLA_RIGHT_REPEAT, BUTTON_NEXT|BUTTON_REPEAT, BUTTON_NONE }, |
245 | #elif (CONFIG_KEYPAD == EROSQ_PAD) | ||
246 | { PLA_UP, BUTTON_NEXT, BUTTON_NONE }, | ||
247 | { PLA_DOWN, BUTTON_PREV, BUTTON_NONE }, | ||
248 | { PLA_LEFT, BUTTON_SCROLL_BACK, BUTTON_NONE }, | ||
249 | { PLA_RIGHT, BUTTON_SCROLL_FWD, BUTTON_NONE }, | ||
250 | { PLA_UP_REPEAT, BUTTON_NEXT|BUTTON_REPEAT, BUTTON_NONE }, | ||
251 | { PLA_DOWN_REPEAT, BUTTON_PREV|BUTTON_REPEAT, BUTTON_NONE }, | ||
252 | // { PLA_LEFT_REPEAT, BUTTON_SCROLL_BACK|BUTTON_REPEAT, BUTTON_NONE }, | ||
253 | // { PLA_RIGHT_REPEAT, BUTTON_SCROLL_FWD|BUTTON_REPEAT, BUTTON_NONE }, | ||
245 | #elif (CONFIG_KEYPAD == IHIFI_770_PAD) | 254 | #elif (CONFIG_KEYPAD == IHIFI_770_PAD) |
246 | { PLA_UP, BUTTON_PREV, BUTTON_NONE }, | 255 | { PLA_UP, BUTTON_PREV, BUTTON_NONE }, |
247 | { PLA_DOWN, BUTTON_NEXT, BUTTON_NONE }, | 256 | { PLA_DOWN, BUTTON_NEXT, BUTTON_NONE }, |
@@ -407,19 +416,19 @@ const struct button_mapping pla_main_ctx[] = | |||
407 | {PLA_SELECT, BUTTON_OK, BUTTON_NONE}, | 416 | {PLA_SELECT, BUTTON_OK, BUTTON_NONE}, |
408 | {PLA_SELECT_REL, BUTTON_OK|BUTTON_REL, BUTTON_OK }, | 417 | {PLA_SELECT_REL, BUTTON_OK|BUTTON_REL, BUTTON_OK }, |
409 | {PLA_SELECT_REPEAT, BUTTON_OK|BUTTON_REPEAT, BUTTON_NONE}, | 418 | {PLA_SELECT_REPEAT, BUTTON_OK|BUTTON_REPEAT, BUTTON_NONE}, |
410 | #elif (CONFIG_KEYPAD == MPIO_HD200_PAD) | 419 | #elif (CONFIG_KEYPAD == MPIO_HD200_PAD) |
411 | {PLA_CANCEL, BUTTON_REC, BUTTON_NONE}, | 420 | {PLA_CANCEL, BUTTON_REC, BUTTON_NONE}, |
412 | {PLA_EXIT, (BUTTON_REC|BUTTON_PLAY), BUTTON_NONE}, | 421 | {PLA_EXIT, (BUTTON_REC|BUTTON_PLAY), BUTTON_NONE}, |
413 | {PLA_SELECT, BUTTON_FUNC, BUTTON_NONE}, | 422 | {PLA_SELECT, BUTTON_FUNC, BUTTON_NONE}, |
414 | {PLA_SELECT_REL, BUTTON_FUNC|BUTTON_REL, BUTTON_FUNC}, | 423 | {PLA_SELECT_REL, BUTTON_FUNC|BUTTON_REL, BUTTON_FUNC}, |
415 | {PLA_SELECT_REPEAT, BUTTON_FUNC|BUTTON_REPEAT, BUTTON_NONE}, | 424 | {PLA_SELECT_REPEAT, BUTTON_FUNC|BUTTON_REPEAT, BUTTON_NONE}, |
416 | #elif (CONFIG_KEYPAD == MPIO_HD300_PAD) | 425 | #elif (CONFIG_KEYPAD == MPIO_HD300_PAD) |
417 | {PLA_CANCEL, BUTTON_MENU, BUTTON_NONE}, | 426 | {PLA_CANCEL, BUTTON_MENU, BUTTON_NONE}, |
418 | {PLA_EXIT, BUTTON_MENU|BUTTON_REPEAT, BUTTON_NONE}, | 427 | {PLA_EXIT, BUTTON_MENU|BUTTON_REPEAT, BUTTON_NONE}, |
419 | {PLA_SELECT, BUTTON_ENTER, BUTTON_NONE}, | 428 | {PLA_SELECT, BUTTON_ENTER, BUTTON_NONE}, |
420 | {PLA_SELECT_REL, BUTTON_ENTER|BUTTON_REL, BUTTON_ENTER}, | 429 | {PLA_SELECT_REL, BUTTON_ENTER|BUTTON_REL, BUTTON_ENTER}, |
421 | {PLA_SELECT_REPEAT, BUTTON_ENTER|BUTTON_REPEAT, BUTTON_NONE}, | 430 | {PLA_SELECT_REPEAT, BUTTON_ENTER|BUTTON_REPEAT, BUTTON_NONE}, |
422 | #elif (CONFIG_KEYPAD == RK27XX_GENERIC_PAD) | 431 | #elif (CONFIG_KEYPAD == RK27XX_GENERIC_PAD) |
423 | {PLA_CANCEL, BUTTON_M, BUTTON_NONE}, | 432 | {PLA_CANCEL, BUTTON_M, BUTTON_NONE}, |
424 | {PLA_EXIT, BUTTON_M|BUTTON_REPEAT, BUTTON_NONE}, | 433 | {PLA_EXIT, BUTTON_M|BUTTON_REPEAT, BUTTON_NONE}, |
425 | {PLA_SELECT, BUTTON_PLAY, BUTTON_NONE}, | 434 | {PLA_SELECT, BUTTON_PLAY, BUTTON_NONE}, |
@@ -431,7 +440,7 @@ const struct button_mapping pla_main_ctx[] = | |||
431 | {PLA_SELECT, BUTTON_SELECT, BUTTON_NONE}, | 440 | {PLA_SELECT, BUTTON_SELECT, BUTTON_NONE}, |
432 | {PLA_SELECT_REL, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT}, | 441 | {PLA_SELECT_REL, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT}, |
433 | {PLA_SELECT_REPEAT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE}, | 442 | {PLA_SELECT_REPEAT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE}, |
434 | #elif (CONFIG_KEYPAD == AGPTEK_ROCKER_PAD) | 443 | #elif (CONFIG_KEYPAD == AGPTEK_ROCKER_PAD) |
435 | {PLA_CANCEL, BUTTON_VOLUP, BUTTON_NONE}, | 444 | {PLA_CANCEL, BUTTON_VOLUP, BUTTON_NONE}, |
436 | {PLA_EXIT, BUTTON_POWER, BUTTON_NONE}, | 445 | {PLA_EXIT, BUTTON_POWER, BUTTON_NONE}, |
437 | {PLA_SELECT, BUTTON_SELECT, BUTTON_NONE}, | 446 | {PLA_SELECT, BUTTON_SELECT, BUTTON_NONE}, |
@@ -479,6 +488,12 @@ const struct button_mapping pla_main_ctx[] = | |||
479 | {PLA_SELECT, BUTTON_PLAY, BUTTON_NONE}, | 488 | {PLA_SELECT, BUTTON_PLAY, BUTTON_NONE}, |
480 | {PLA_SELECT_REL, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY}, | 489 | {PLA_SELECT_REL, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY}, |
481 | {PLA_SELECT_REPEAT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE}, | 490 | {PLA_SELECT_REPEAT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE}, |
491 | #elif (CONFIG_KEYPAD == EROSQ_PAD) | ||
492 | {PLA_CANCEL, BUTTON_BACK|BUTTON_REL, BUTTON_BACK}, | ||
493 | {PLA_EXIT, BUTTON_POWER, BUTTON_NONE}, | ||
494 | {PLA_SELECT, BUTTON_PLAY, BUTTON_NONE}, | ||
495 | {PLA_SELECT_REL, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY}, | ||
496 | {PLA_SELECT_REPEAT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE}, | ||
482 | #elif (CONFIG_KEYPAD == IHIFI_770_PAD) | 497 | #elif (CONFIG_KEYPAD == IHIFI_770_PAD) |
483 | {PLA_CANCEL, BUTTON_POWER|BUTTON_REL, BUTTON_POWER}, | 498 | {PLA_CANCEL, BUTTON_POWER|BUTTON_REL, BUTTON_POWER}, |
484 | {PLA_EXIT, BUTTON_POWER|BUTTON_REPEAT, BUTTON_NONE}, | 499 | {PLA_EXIT, BUTTON_POWER|BUTTON_REPEAT, BUTTON_NONE}, |
@@ -501,7 +516,7 @@ const struct button_mapping pla_main_ctx[] = | |||
501 | 516 | ||
502 | static struct button_mapping **plugin_context_order; | 517 | static struct button_mapping **plugin_context_order; |
503 | static int plugin_context_count = 0; | 518 | static int plugin_context_count = 0; |
504 | static int last_context = 0; /* index into plugin_context_order | 519 | static int last_context = 0; /* index into plugin_context_order |
505 | of the last context returned */ | 520 | of the last context returned */ |
506 | 521 | ||
507 | static const struct button_mapping* get_context_map(int context) | 522 | static const struct button_mapping* get_context_map(int context) |