diff options
Diffstat (limited to 'apps/wps.c')
-rw-r--r-- | apps/wps.c | 36 |
1 files changed, 27 insertions, 9 deletions
diff --git a/apps/wps.c b/apps/wps.c index a39f2ba30c..10cc0c00fb 100644 --- a/apps/wps.c +++ b/apps/wps.c | |||
@@ -53,7 +53,7 @@ static bool paused = false; | |||
53 | static struct mp3entry* id3 = NULL; | 53 | static struct mp3entry* id3 = NULL; |
54 | static char current_track_path[MAX_PATH+1]; | 54 | static char current_track_path[MAX_PATH+1]; |
55 | 55 | ||
56 | #ifdef HAVE_PLAYER_KEYPAD | 56 | #if defined(HAVE_PLAYER_KEYPAD) || defined(HAVE_NEO_KEYPAD) |
57 | void player_change_volume(int button) | 57 | void player_change_volume(int button) |
58 | { | 58 | { |
59 | bool exit = false; | 59 | bool exit = false; |
@@ -278,7 +278,7 @@ bool browse_id3(void) | |||
278 | case BUTTON_REPEAT: | 278 | case BUTTON_REPEAT: |
279 | break; | 279 | break; |
280 | 280 | ||
281 | #ifdef HAVE_PLAYER_KEYPAD | 281 | #ifdef BUTTON_STOP |
282 | case BUTTON_STOP: | 282 | case BUTTON_STOP: |
283 | #else | 283 | #else |
284 | case BUTTON_OFF: | 284 | case BUTTON_OFF: |
@@ -506,7 +506,7 @@ static bool menu(void) | |||
506 | break; | 506 | break; |
507 | 507 | ||
508 | /* mute */ | 508 | /* mute */ |
509 | #ifdef HAVE_PLAYER_KEYPAD | 509 | #ifdef BUTTON_MENU |
510 | case BUTTON_MENU | BUTTON_PLAY: | 510 | case BUTTON_MENU | BUTTON_PLAY: |
511 | #else | 511 | #else |
512 | case BUTTON_F1 | BUTTON_PLAY: | 512 | case BUTTON_F1 | BUTTON_PLAY: |
@@ -534,7 +534,7 @@ static bool menu(void) | |||
534 | while (button_get(false)); /* clear button queue */ | 534 | while (button_get(false)); /* clear button queue */ |
535 | break; | 535 | break; |
536 | 536 | ||
537 | #ifdef HAVE_PLAYER_KEYPAD | 537 | #ifdef BUTTON_MENU |
538 | /* change volume */ | 538 | /* change volume */ |
539 | case BUTTON_MENU | BUTTON_LEFT: | 539 | case BUTTON_MENU | BUTTON_LEFT: |
540 | case BUTTON_MENU | BUTTON_LEFT | BUTTON_REPEAT: | 540 | case BUTTON_MENU | BUTTON_LEFT | BUTTON_REPEAT: |
@@ -545,9 +545,11 @@ static bool menu(void) | |||
545 | break; | 545 | break; |
546 | 546 | ||
547 | /* show id3 tags */ | 547 | /* show id3 tags */ |
548 | #ifdef BUTTON_ON | ||
548 | case BUTTON_MENU | BUTTON_ON: | 549 | case BUTTON_MENU | BUTTON_ON: |
549 | status_set_param(true); | 550 | status_set_param(true); |
550 | status_set_audio(true); | 551 | status_set_audio(true); |
552 | #endif | ||
551 | #else | 553 | #else |
552 | case BUTTON_F1 | BUTTON_ON: | 554 | case BUTTON_F1 | BUTTON_ON: |
553 | #endif | 555 | #endif |
@@ -742,8 +744,11 @@ int wps_show(void) | |||
742 | ! ((button & BUTTON_MENU) || | 744 | ! ((button & BUTTON_MENU) || |
743 | #endif | 745 | #endif |
744 | (button == BUTTON_NONE) || | 746 | (button == BUTTON_NONE) || |
745 | (button == SYS_USB_CONNECTED) || | 747 | (button == SYS_USB_CONNECTED) |
746 | (button & BUTTON_REMOTE))) | 748 | #ifdef BUTTON_REMOTE |
749 | || (button & BUTTON_REMOTE) | ||
750 | #endif | ||
751 | )) | ||
747 | { | 752 | { |
748 | while (button_get(false)); /* clear button queue */ | 753 | while (button_get(false)); /* clear button queue */ |
749 | display_keylock_text(true); | 754 | display_keylock_text(true); |
@@ -759,6 +764,7 @@ int wps_show(void) | |||
759 | 764 | ||
760 | switch(button) | 765 | switch(button) |
761 | { | 766 | { |
767 | #ifdef BUTTON_ON | ||
762 | case BUTTON_ON: | 768 | case BUTTON_ON: |
763 | #ifdef HAVE_RECORDER_KEYPAD | 769 | #ifdef HAVE_RECORDER_KEYPAD |
764 | switch (on_screen()) { | 770 | switch (on_screen()) { |
@@ -795,10 +801,12 @@ int wps_show(void) | |||
795 | } | 801 | } |
796 | break; | 802 | break; |
797 | #endif | 803 | #endif |
798 | 804 | #endif /* BUTTON_ON */ | |
799 | /* play/pause */ | 805 | /* play/pause */ |
800 | case BUTTON_PLAY: | 806 | case BUTTON_PLAY: |
807 | #ifdef BUTTON_RC_PLAY | ||
801 | case BUTTON_RC_PLAY: | 808 | case BUTTON_RC_PLAY: |
809 | #endif | ||
802 | if ( paused ) | 810 | if ( paused ) |
803 | { | 811 | { |
804 | paused = false; | 812 | paused = false; |
@@ -830,7 +838,9 @@ int wps_show(void) | |||
830 | case BUTTON_UP: | 838 | case BUTTON_UP: |
831 | case BUTTON_UP | BUTTON_REPEAT: | 839 | case BUTTON_UP | BUTTON_REPEAT: |
832 | #endif | 840 | #endif |
841 | #ifdef BUTTON_RC_VOL_UP | ||
833 | case BUTTON_RC_VOL_UP: | 842 | case BUTTON_RC_VOL_UP: |
843 | #endif | ||
834 | global_settings.volume++; | 844 | global_settings.volume++; |
835 | if(global_settings.volume > mpeg_sound_max(SOUND_VOLUME)) | 845 | if(global_settings.volume > mpeg_sound_max(SOUND_VOLUME)) |
836 | global_settings.volume = mpeg_sound_max(SOUND_VOLUME); | 846 | global_settings.volume = mpeg_sound_max(SOUND_VOLUME); |
@@ -844,7 +854,9 @@ int wps_show(void) | |||
844 | case BUTTON_DOWN: | 854 | case BUTTON_DOWN: |
845 | case BUTTON_DOWN | BUTTON_REPEAT: | 855 | case BUTTON_DOWN | BUTTON_REPEAT: |
846 | #endif | 856 | #endif |
857 | #ifdef BUTTON_RC_VOL_DOWN | ||
847 | case BUTTON_RC_VOL_DOWN: | 858 | case BUTTON_RC_VOL_DOWN: |
859 | #endif | ||
848 | global_settings.volume--; | 860 | global_settings.volume--; |
849 | if(global_settings.volume < mpeg_sound_min(SOUND_VOLUME)) | 861 | if(global_settings.volume < mpeg_sound_min(SOUND_VOLUME)) |
850 | global_settings.volume = mpeg_sound_min(SOUND_VOLUME); | 862 | global_settings.volume = mpeg_sound_min(SOUND_VOLUME); |
@@ -860,7 +872,9 @@ int wps_show(void) | |||
860 | break; | 872 | break; |
861 | 873 | ||
862 | /* prev / restart */ | 874 | /* prev / restart */ |
875 | #ifdef BUTTON_RC_LEFT | ||
863 | case BUTTON_RC_LEFT: | 876 | case BUTTON_RC_LEFT: |
877 | #endif | ||
864 | case BUTTON_LEFT | BUTTON_REL: | 878 | case BUTTON_LEFT | BUTTON_REL: |
865 | #ifdef HAVE_RECORDER_KEYPAD | 879 | #ifdef HAVE_RECORDER_KEYPAD |
866 | if ((button == (BUTTON_LEFT | BUTTON_REL)) && | 880 | if ((button == (BUTTON_LEFT | BUTTON_REL)) && |
@@ -882,7 +896,9 @@ int wps_show(void) | |||
882 | break; | 896 | break; |
883 | 897 | ||
884 | /* next */ | 898 | /* next */ |
899 | #ifdef BUTTON_RC_RIGHT | ||
885 | case BUTTON_RC_RIGHT: | 900 | case BUTTON_RC_RIGHT: |
901 | #endif | ||
886 | case BUTTON_RIGHT | BUTTON_REL: | 902 | case BUTTON_RIGHT | BUTTON_REL: |
887 | #ifdef HAVE_RECORDER_KEYPAD | 903 | #ifdef HAVE_RECORDER_KEYPAD |
888 | if ((button == (BUTTON_RIGHT | BUTTON_REL)) && | 904 | if ((button == (BUTTON_RIGHT | BUTTON_REL)) && |
@@ -893,7 +909,7 @@ int wps_show(void) | |||
893 | break; | 909 | break; |
894 | 910 | ||
895 | /* menu key functions */ | 911 | /* menu key functions */ |
896 | #ifdef HAVE_PLAYER_KEYPAD | 912 | #ifdef BUTTON_MENU |
897 | case BUTTON_MENU: | 913 | case BUTTON_MENU: |
898 | #else | 914 | #else |
899 | case BUTTON_F1: | 915 | case BUTTON_F1: |
@@ -922,8 +938,10 @@ int wps_show(void) | |||
922 | #endif | 938 | #endif |
923 | 939 | ||
924 | /* stop and exit wps */ | 940 | /* stop and exit wps */ |
941 | #ifdef BUTTON_RC_STOP | ||
925 | case BUTTON_RC_STOP: | 942 | case BUTTON_RC_STOP: |
926 | #ifdef HAVE_RECORDER_KEYPAD | 943 | #endif |
944 | #ifdef BUTTON_OFF | ||
927 | case BUTTON_OFF: | 945 | case BUTTON_OFF: |
928 | #else | 946 | #else |
929 | case BUTTON_STOP | BUTTON_REL: | 947 | case BUTTON_STOP | BUTTON_REL: |