diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/plugins/fft/fft.c | 15 | ||||
-rw-r--r-- | apps/plugins/mpegplayer/mpegplayer.c | 9 | ||||
-rw-r--r-- | apps/plugins/pegbox.c | 15 | ||||
-rw-r--r-- | apps/plugins/sudoku/sudoku.h | 1 |
4 files changed, 15 insertions, 25 deletions
diff --git a/apps/plugins/fft/fft.c b/apps/plugins/fft/fft.c index 28c3cd045c..9f51102979 100644 --- a/apps/plugins/fft/fft.c +++ b/apps/plugins/fft/fft.c | |||
@@ -303,13 +303,14 @@ GREY_INFO_STRUCT | |||
303 | # define FFT_QUIT BUTTON_POWER | 303 | # define FFT_QUIT BUTTON_POWER |
304 | 304 | ||
305 | #elif (CONFIG_KEYPAD == SONY_NWZ_PAD) | 305 | #elif (CONFIG_KEYPAD == SONY_NWZ_PAD) |
306 | #define FFT_PREV_GRAPH BUTTON_LEFT | 306 | # define FFT_PREV_GRAPH BUTTON_LEFT |
307 | #define FFT_NEXT_GRAPH BUTTON_RIGHT | 307 | # define FFT_NEXT_GRAPH BUTTON_RIGHT |
308 | #define FFT_AMP_SCALE BUTTON_UP | 308 | # define FFT_AMP_SCALE BUTTON_UP |
309 | #define FFT_FREQ_SCALE BUTTON_DOWN | 309 | # define FFT_FREQ_SCALE BUTTON_DOWN |
310 | #define FFT_QUIT BUTTON_BACK | 310 | # define FFT_QUIT BUTTON_BACK |
311 | #define FFT_ORIENTATION BUTTON_POWER | 311 | # define FFT_ORIENTATION BUTTON_POWER |
312 | #define FFT_WINDOW BUTTON_PLAY | 312 | # define FFT_WINDOW BUTTON_PLAY |
313 | |||
313 | 314 | ||
314 | #elif !defined(HAVE_TOUCHSCREEN) | 315 | #elif !defined(HAVE_TOUCHSCREEN) |
315 | #error No keymap defined! | 316 | #error No keymap defined! |
diff --git a/apps/plugins/mpegplayer/mpegplayer.c b/apps/plugins/mpegplayer/mpegplayer.c index 69062d5062..fbef00d884 100644 --- a/apps/plugins/mpegplayer/mpegplayer.c +++ b/apps/plugins/mpegplayer/mpegplayer.c | |||
@@ -403,10 +403,11 @@ CONFIG_KEYPAD == SANSA_M200_PAD | |||
403 | #define MPEG_MENU BUTTON_BACK | 403 | #define MPEG_MENU BUTTON_BACK |
404 | #define MPEG_PAUSE BUTTON_PLAY | 404 | #define MPEG_PAUSE BUTTON_PLAY |
405 | #define MPEG_STOP BUTTON_POWER | 405 | #define MPEG_STOP BUTTON_POWER |
406 | #define MPEG_VOLDOWN BUTTON_LEFT | 406 | #define MPEG_VOLDOWN BUTTON_UP |
407 | #define MPEG_VOLUP BUTTON_RIGHT | 407 | #define MPEG_VOLUP BUTTON_DOWN |
408 | #define MPEG_RW BUTTON_UP | 408 | #define MPEG_RW BUTTON_LEFT |
409 | #define MPEG_FF BUTTON_DOWN | 409 | #define MPEG_FF BUTTON_RIGHT |
410 | |||
410 | 411 | ||
411 | #else | 412 | #else |
412 | #error No keymap defined! | 413 | #error No keymap defined! |
diff --git a/apps/plugins/pegbox.c b/apps/plugins/pegbox.c index c3a99389f5..28069a551d 100644 --- a/apps/plugins/pegbox.c +++ b/apps/plugins/pegbox.c | |||
@@ -425,7 +425,6 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
425 | #define PEGBOX_LEFT BUTTON_LEFT | 425 | #define PEGBOX_LEFT BUTTON_LEFT |
426 | #define PEGBOX_SELECT BUTTON_PLAY | 426 | #define PEGBOX_SELECT BUTTON_PLAY |
427 | 427 | ||
428 | #define SAVE_TEXT "FFWD" | ||
429 | #define QUIT_TEXT "REC" | 428 | #define QUIT_TEXT "REC" |
430 | #define RESTART_TEXT "REW" | 429 | #define RESTART_TEXT "REW" |
431 | #define LVL_UP_TEXT "PLAY+FFWD" | 430 | #define LVL_UP_TEXT "PLAY+FFWD" |
@@ -443,7 +442,6 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
443 | #define PEGBOX_LEFT BUTTON_LEFT | 442 | #define PEGBOX_LEFT BUTTON_LEFT |
444 | #define PEGBOX_SELECT BUTTON_PLAY | 443 | #define PEGBOX_SELECT BUTTON_PLAY |
445 | 444 | ||
446 | #define SAVE_TEXT "REC + FFWD" | ||
447 | #define QUIT_TEXT "REC + PLAY" | 445 | #define QUIT_TEXT "REC + PLAY" |
448 | #define RESTART_TEXT "REC + REW" | 446 | #define RESTART_TEXT "REC + REW" |
449 | #define LVL_UP_TEXT "FFWD" | 447 | #define LVL_UP_TEXT "FFWD" |
@@ -461,7 +459,6 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
461 | #define PEGBOX_LEFT BUTTON_PREV | 459 | #define PEGBOX_LEFT BUTTON_PREV |
462 | #define PEGBOX_SELECT BUTTON_PLAY | 460 | #define PEGBOX_SELECT BUTTON_PLAY |
463 | 461 | ||
464 | #define SAVE_TEXT "REC + OK" | ||
465 | #define QUIT_TEXT "REC" | 462 | #define QUIT_TEXT "REC" |
466 | #define RESTART_TEXT "MENU" | 463 | #define RESTART_TEXT "MENU" |
467 | #define LVL_UP_TEXT "OK" | 464 | #define LVL_UP_TEXT "OK" |
@@ -479,7 +476,6 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
479 | #define PEGBOX_LEFT BUTTON_VOL_DOWN | 476 | #define PEGBOX_LEFT BUTTON_VOL_DOWN |
480 | #define PEGBOX_SELECT BUTTON_FUNC | 477 | #define PEGBOX_SELECT BUTTON_FUNC |
481 | 478 | ||
482 | #define SAVE_TEXT "PLAY + FUNC" | ||
483 | #define QUIT_TEXT "REC + PLAY" | 479 | #define QUIT_TEXT "REC + PLAY" |
484 | #define RESTART_TEXT "REC" | 480 | #define RESTART_TEXT "REC" |
485 | #define LVL_UP_TEXT "REW" | 481 | #define LVL_UP_TEXT "REW" |
@@ -497,7 +493,6 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
497 | #define PEGBOX_LEFT BUTTON_REW | 493 | #define PEGBOX_LEFT BUTTON_REW |
498 | #define PEGBOX_SELECT (BUTTON_ENTER | BUTTON_REL) | 494 | #define PEGBOX_SELECT (BUTTON_ENTER | BUTTON_REL) |
499 | 495 | ||
500 | #define SAVE_TEXT "Long ENTER" | ||
501 | #define QUIT_TEXT "Long MENU" | 496 | #define QUIT_TEXT "Long MENU" |
502 | #define RESTART_TEXT "MENU" | 497 | #define RESTART_TEXT "MENU" |
503 | #define LVL_UP_TEXT "PLAY" | 498 | #define LVL_UP_TEXT "PLAY" |
@@ -515,7 +510,6 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
515 | #define PEGBOX_LEFT BUTTON_LEFT | 510 | #define PEGBOX_LEFT BUTTON_LEFT |
516 | #define PEGBOX_SELECT BUTTON_SELECT | 511 | #define PEGBOX_SELECT BUTTON_SELECT |
517 | 512 | ||
518 | #define SAVE_TEXT "PLAYPAUSE" | ||
519 | #define QUIT_TEXT "POWER" | 513 | #define QUIT_TEXT "POWER" |
520 | #define RESTART_TEXT "BACK" | 514 | #define RESTART_TEXT "BACK" |
521 | #define LVL_UP_TEXT "Vol+" | 515 | #define LVL_UP_TEXT "Vol+" |
@@ -533,7 +527,6 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
533 | #define PEGBOX_RIGHT BUTTON_RIGHT | 527 | #define PEGBOX_RIGHT BUTTON_RIGHT |
534 | #define PEGBOX_LEFT BUTTON_LEFT | 528 | #define PEGBOX_LEFT BUTTON_LEFT |
535 | 529 | ||
536 | #define SAVE_TEXT "Vol+" | ||
537 | #define QUIT_TEXT "POWER" | 530 | #define QUIT_TEXT "POWER" |
538 | #define RESTART_TEXT "Vol-" | 531 | #define RESTART_TEXT "Vol-" |
539 | #define LVL_UP_TEXT "NEXT" | 532 | #define LVL_UP_TEXT "NEXT" |
@@ -551,7 +544,6 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
551 | #define PEGBOX_RIGHT BUTTON_RIGHT | 544 | #define PEGBOX_RIGHT BUTTON_RIGHT |
552 | #define PEGBOX_LEFT BUTTON_LEFT | 545 | #define PEGBOX_LEFT BUTTON_LEFT |
553 | 546 | ||
554 | #define SAVE_TEXT "PLAYPAUSE" | ||
555 | #define QUIT_TEXT "POWER" | 547 | #define QUIT_TEXT "POWER" |
556 | #define RESTART_TEXT "BACK" | 548 | #define RESTART_TEXT "BACK" |
557 | #define LVL_UP_TEXT "Vol+" | 549 | #define LVL_UP_TEXT "Vol+" |
@@ -569,7 +561,6 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
569 | #define PEGBOX_RIGHT BUTTON_RIGHT | 561 | #define PEGBOX_RIGHT BUTTON_RIGHT |
570 | #define PEGBOX_LEFT BUTTON_LEFT | 562 | #define PEGBOX_LEFT BUTTON_LEFT |
571 | 563 | ||
572 | #define SAVE_TEXT "POWER + SELECT" | ||
573 | #define QUIT_TEXT "POWER" | 564 | #define QUIT_TEXT "POWER" |
574 | #define RESTART_TEXT "POWER + LEFT" | 565 | #define RESTART_TEXT "POWER + LEFT" |
575 | #define LVL_UP_TEXT "POWER + UP" | 566 | #define LVL_UP_TEXT "POWER + UP" |
@@ -587,7 +578,6 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
587 | #define PEGBOX_RIGHT BUTTON_RIGHT | 578 | #define PEGBOX_RIGHT BUTTON_RIGHT |
588 | #define PEGBOX_LEFT BUTTON_LEFT | 579 | #define PEGBOX_LEFT BUTTON_LEFT |
589 | 580 | ||
590 | #define SAVE_TEXT "PLAY" | ||
591 | #define QUIT_TEXT "POWER" | 581 | #define QUIT_TEXT "POWER" |
592 | #define RESTART_TEXT "POWER + PREV" | 582 | #define RESTART_TEXT "POWER + PREV" |
593 | #define LVL_UP_TEXT "NEXT" | 583 | #define LVL_UP_TEXT "NEXT" |
@@ -603,11 +593,10 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
603 | #define PEGBOX_SELECT BUTTON_PLAY | 593 | #define PEGBOX_SELECT BUTTON_PLAY |
604 | #define PEGBOX_RESTART BUTTON_BACK | 594 | #define PEGBOX_RESTART BUTTON_BACK |
605 | 595 | ||
606 | #define SAVE_TEXT "BACK+PLAY" | ||
607 | #define QUIT_TEXT "POWER" | 596 | #define QUIT_TEXT "POWER" |
608 | #define RESTART_TEXT "BACK+POWER" | 597 | #define RESTART_TEXT "BACK+POWER" |
609 | #define LVL_UP_TEXT "BACK+RIGHT" | 598 | #define LVL_UP_TEXT "" |
610 | #define LVL_DOWN_TEXT "BACK+LEFT" | 599 | #define LVL_DOWN_TEXT "" |
611 | #define SELECT_TEXT "PLAY" | 600 | #define SELECT_TEXT "PLAY" |
612 | 601 | ||
613 | 602 | ||
diff --git a/apps/plugins/sudoku/sudoku.h b/apps/plugins/sudoku/sudoku.h index ba476b4b55..11abc9c448 100644 --- a/apps/plugins/sudoku/sudoku.h +++ b/apps/plugins/sudoku/sudoku.h | |||
@@ -380,7 +380,6 @@ | |||
380 | #define SUDOKU_BUTTON_POSSIBLE (BUTTON_POWER | BUTTON_SELECT) | 380 | #define SUDOKU_BUTTON_POSSIBLE (BUTTON_POWER | BUTTON_SELECT) |
381 | #define SUDOKU_BUTTON_ALTTOGGLE BUTTON_SELECT | 381 | #define SUDOKU_BUTTON_ALTTOGGLE BUTTON_SELECT |
382 | 382 | ||
383 | |||
384 | #elif CONFIG_KEYPAD == SONY_NWZ_PAD | 383 | #elif CONFIG_KEYPAD == SONY_NWZ_PAD |
385 | #define SUDOKU_BUTTON_MENU BUTTON_BACK | 384 | #define SUDOKU_BUTTON_MENU BUTTON_BACK |
386 | #define SUDOKU_BUTTON_UP BUTTON_UP | 385 | #define SUDOKU_BUTTON_UP BUTTON_UP |