diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/plugins/doom/i_video.c | 3 | ||||
-rw-r--r-- | apps/plugins/pegbox.c | 9 |
2 files changed, 0 insertions, 12 deletions
diff --git a/apps/plugins/doom/i_video.c b/apps/plugins/doom/i_video.c index 10aee392a2..200a663494 100644 --- a/apps/plugins/doom/i_video.c +++ b/apps/plugins/doom/i_video.c | |||
@@ -447,7 +447,6 @@ void I_ShutdownGraphics(void) | |||
447 | #define DOOMBUTTON_LEFT BUTTON_LEFT | 447 | #define DOOMBUTTON_LEFT BUTTON_LEFT |
448 | #define DOOMBUTTON_RIGHT BUTTON_RIGHT | 448 | #define DOOMBUTTON_RIGHT BUTTON_RIGHT |
449 | #define DOOMBUTTON_OPEN BUTTON_PLAYPAUSE | 449 | #define DOOMBUTTON_OPEN BUTTON_PLAYPAUSE |
450 | #define DOOMBUTTON_QUIT BUTTON_POWER | ||
451 | #define DOOMBUTTON_ESC BUTTON_BACK | 450 | #define DOOMBUTTON_ESC BUTTON_BACK |
452 | #define DOOMBUTTON_ENTER BUTTON_SELECT | 451 | #define DOOMBUTTON_ENTER BUTTON_SELECT |
453 | #define DOOMBUTTON_SHOOT BUTTON_SELECT | 452 | #define DOOMBUTTON_SHOOT BUTTON_SELECT |
@@ -482,7 +481,6 @@ void I_ShutdownGraphics(void) | |||
482 | #define DOOMBUTTON_LEFT BUTTON_LEFT | 481 | #define DOOMBUTTON_LEFT BUTTON_LEFT |
483 | #define DOOMBUTTON_RIGHT BUTTON_RIGHT | 482 | #define DOOMBUTTON_RIGHT BUTTON_RIGHT |
484 | #define DOOMBUTTON_OPEN (BUTTON_POWER | BUTTON_SELECT) | 483 | #define DOOMBUTTON_OPEN (BUTTON_POWER | BUTTON_SELECT) |
485 | #define DOOMBUTTON_QUIT BUTTON_POWER | ||
486 | #define DOOMBUTTON_ESC (BUTTON_POWER | BUTTON_UP) | 484 | #define DOOMBUTTON_ESC (BUTTON_POWER | BUTTON_UP) |
487 | #define DOOMBUTTON_ENTER BUTTON_SELECT | 485 | #define DOOMBUTTON_ENTER BUTTON_SELECT |
488 | #define DOOMBUTTON_SHOOT BUTTON_SELECT | 486 | #define DOOMBUTTON_SHOOT BUTTON_SELECT |
@@ -495,7 +493,6 @@ void I_ShutdownGraphics(void) | |||
495 | #define DOOMBUTTON_LEFT BUTTON_LEFT | 493 | #define DOOMBUTTON_LEFT BUTTON_LEFT |
496 | #define DOOMBUTTON_RIGHT BUTTON_RIGHT | 494 | #define DOOMBUTTON_RIGHT BUTTON_RIGHT |
497 | #define DOOMBUTTON_OPEN BUTTON_PLAY | 495 | #define DOOMBUTTON_OPEN BUTTON_PLAY |
498 | #define DOOMBUTTON_QUIT BUTTON_POWER | ||
499 | #define DOOMBUTTON_ESC (BUTTON_POWER | BUTTON_SELECT) | 496 | #define DOOMBUTTON_ESC (BUTTON_POWER | BUTTON_SELECT) |
500 | #define DOOMBUTTON_ENTER BUTTON_SELECT | 497 | #define DOOMBUTTON_ENTER BUTTON_SELECT |
501 | #define DOOMBUTTON_SHOOT BUTTON_SELECT | 498 | #define DOOMBUTTON_SHOOT BUTTON_SELECT |
diff --git a/apps/plugins/pegbox.c b/apps/plugins/pegbox.c index f53c8f9519..9ad816c6a1 100644 --- a/apps/plugins/pegbox.c +++ b/apps/plugins/pegbox.c | |||
@@ -415,7 +415,6 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
415 | #define QUIT_TEXT "POWER" | 415 | #define QUIT_TEXT "POWER" |
416 | 416 | ||
417 | #elif CONFIG_KEYPAD == SAMSUNG_YH820_PAD | 417 | #elif CONFIG_KEYPAD == SAMSUNG_YH820_PAD |
418 | #define PEGBOX_SAVE BUTTON_FFWD | ||
419 | #define PEGBOX_QUIT BUTTON_REC | 418 | #define PEGBOX_QUIT BUTTON_REC |
420 | #define PEGBOX_RESTART BUTTON_REW | 419 | #define PEGBOX_RESTART BUTTON_REW |
421 | #define PEGBOX_LVL_UP (BUTTON_PLAY|BUTTON_FFWD) | 420 | #define PEGBOX_LVL_UP (BUTTON_PLAY|BUTTON_FFWD) |
@@ -434,7 +433,6 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
434 | #define SELECT_TEXT "PLAY" | 433 | #define SELECT_TEXT "PLAY" |
435 | 434 | ||
436 | #elif CONFIG_KEYPAD == SAMSUNG_YH920_PAD | 435 | #elif CONFIG_KEYPAD == SAMSUNG_YH920_PAD |
437 | #define PEGBOX_SAVE (BUTTON_REC|BUTTON_FFWD) | ||
438 | #define PEGBOX_QUIT (BUTTON_REC|BUTTON_PLAY) | 436 | #define PEGBOX_QUIT (BUTTON_REC|BUTTON_PLAY) |
439 | #define PEGBOX_RESTART (BUTTON_REC|BUTTON_REW) | 437 | #define PEGBOX_RESTART (BUTTON_REC|BUTTON_REW) |
440 | #define PEGBOX_LVL_UP BUTTON_FFWD | 438 | #define PEGBOX_LVL_UP BUTTON_FFWD |
@@ -453,7 +451,6 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
453 | #define SELECT_TEXT "PLAY" | 451 | #define SELECT_TEXT "PLAY" |
454 | 452 | ||
455 | #elif CONFIG_KEYPAD == PBELL_VIBE500_PAD | 453 | #elif CONFIG_KEYPAD == PBELL_VIBE500_PAD |
456 | #define PEGBOX_SAVE (BUTTON_REC|BUTTON_OK) | ||
457 | #define PEGBOX_QUIT BUTTON_REC | 454 | #define PEGBOX_QUIT BUTTON_REC |
458 | #define PEGBOX_RESTART BUTTON_MENU | 455 | #define PEGBOX_RESTART BUTTON_MENU |
459 | #define PEGBOX_LVL_UP BUTTON_OK | 456 | #define PEGBOX_LVL_UP BUTTON_OK |
@@ -472,7 +469,6 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
472 | #define SELECT_TEXT "PLAY" | 469 | #define SELECT_TEXT "PLAY" |
473 | 470 | ||
474 | #elif CONFIG_KEYPAD == MPIO_HD200_PAD | 471 | #elif CONFIG_KEYPAD == MPIO_HD200_PAD |
475 | #define PEGBOX_SAVE (BUTTON_PLAY|BUTTON_FUNC) | ||
476 | #define PEGBOX_QUIT (BUTTON_REC|BUTTON_PLAY) | 472 | #define PEGBOX_QUIT (BUTTON_REC|BUTTON_PLAY) |
477 | #define PEGBOX_RESTART BUTTON_REC | 473 | #define PEGBOX_RESTART BUTTON_REC |
478 | #define PEGBOX_LVL_UP (BUTTON_PLAY|BUTTON_REW) | 474 | #define PEGBOX_LVL_UP (BUTTON_PLAY|BUTTON_REW) |
@@ -491,7 +487,6 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
491 | #define SELECT_TEXT "FUNC" | 487 | #define SELECT_TEXT "FUNC" |
492 | 488 | ||
493 | #elif CONFIG_KEYPAD == MPIO_HD300_PAD | 489 | #elif CONFIG_KEYPAD == MPIO_HD300_PAD |
494 | #define PEGBOX_SAVE (BUTTON_ENTER | BUTTON_REPEAT) | ||
495 | #define PEGBOX_QUIT (BUTTON_MENU | BUTTON_REPEAT) | 490 | #define PEGBOX_QUIT (BUTTON_MENU | BUTTON_REPEAT) |
496 | #define PEGBOX_RESTART (BUTTON_MENU | BUTTON_REL) | 491 | #define PEGBOX_RESTART (BUTTON_MENU | BUTTON_REL) |
497 | #define PEGBOX_LVL_UP BUTTON_PLAY | 492 | #define PEGBOX_LVL_UP BUTTON_PLAY |
@@ -511,7 +506,6 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
511 | 506 | ||
512 | #elif CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD | 507 | #elif CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD |
513 | #define PEGBOX_QUIT BUTTON_POWER | 508 | #define PEGBOX_QUIT BUTTON_POWER |
514 | #define PEGBOX_SAVE BUTTON_PLAYPAUSE | ||
515 | #define PEGBOX_RESTART BUTTON_BACK | 509 | #define PEGBOX_RESTART BUTTON_BACK |
516 | #define PEGBOX_LVL_UP BUTTON_VOL_UP | 510 | #define PEGBOX_LVL_UP BUTTON_VOL_UP |
517 | #define PEGBOX_LVL_DOWN BUTTON_VOL_DOWN | 511 | #define PEGBOX_LVL_DOWN BUTTON_VOL_DOWN |
@@ -531,7 +525,6 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
531 | #elif CONFIG_KEYPAD == SANSA_CONNECT_PAD | 525 | #elif CONFIG_KEYPAD == SANSA_CONNECT_PAD |
532 | #define PEGBOX_SELECT BUTTON_SELECT | 526 | #define PEGBOX_SELECT BUTTON_SELECT |
533 | #define PEGBOX_QUIT BUTTON_POWER | 527 | #define PEGBOX_QUIT BUTTON_POWER |
534 | #define PEGBOX_SAVE BUTTON_VOL_UP | ||
535 | #define PEGBOX_RESTART BUTTON_VOL_DOWN | 528 | #define PEGBOX_RESTART BUTTON_VOL_DOWN |
536 | #define PEGBOX_LVL_UP BUTTON_NEXT | 529 | #define PEGBOX_LVL_UP BUTTON_NEXT |
537 | #define PEGBOX_LVL_DOWN BUTTON_PREV | 530 | #define PEGBOX_LVL_DOWN BUTTON_PREV |
@@ -568,7 +561,6 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
568 | #elif CONFIG_KEYPAD == HM60X_PAD | 561 | #elif CONFIG_KEYPAD == HM60X_PAD |
569 | #define PEGBOX_SELECT BUTTON_SELECT | 562 | #define PEGBOX_SELECT BUTTON_SELECT |
570 | #define PEGBOX_QUIT BUTTON_POWER | 563 | #define PEGBOX_QUIT BUTTON_POWER |
571 | #define PEGBOX_SAVE (BUTTON_POWER|BUTTON_SELECT) | ||
572 | #define PEGBOX_RESTART (BUTTON_POWER|BUTTON_LEFT) | 564 | #define PEGBOX_RESTART (BUTTON_POWER|BUTTON_LEFT) |
573 | #define PEGBOX_LVL_UP (BUTTON_POWER|BUTTON_UP) | 565 | #define PEGBOX_LVL_UP (BUTTON_POWER|BUTTON_UP) |
574 | #define PEGBOX_LVL_DOWN (BUTTON_POWER|BUTTON_DOWN) | 566 | #define PEGBOX_LVL_DOWN (BUTTON_POWER|BUTTON_DOWN) |
@@ -587,7 +579,6 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
587 | #elif CONFIG_KEYPAD == HM801_PAD | 579 | #elif CONFIG_KEYPAD == HM801_PAD |
588 | #define PEGBOX_SELECT BUTTON_SELECT | 580 | #define PEGBOX_SELECT BUTTON_SELECT |
589 | #define PEGBOX_QUIT BUTTON_POWER | 581 | #define PEGBOX_QUIT BUTTON_POWER |
590 | #define PEGBOX_SAVE BUTTON_PLAY | ||
591 | #define PEGBOX_RESTART (BUTTON_POWER|BUTTON_PREV) | 582 | #define PEGBOX_RESTART (BUTTON_POWER|BUTTON_PREV) |
592 | #define PEGBOX_LVL_UP BUTTON_NEXT | 583 | #define PEGBOX_LVL_UP BUTTON_NEXT |
593 | #define PEGBOX_LVL_DOWN BUTTON_PREV | 584 | #define PEGBOX_LVL_DOWN BUTTON_PREV |