diff options
author | Björn Stenberg <bjorn@haxx.se> | 2003-04-23 09:21:37 +0000 |
---|---|---|
committer | Björn Stenberg <bjorn@haxx.se> | 2003-04-23 09:21:37 +0000 |
commit | 28cce684a3f433200e5257eb929ee8d7a63b67ff (patch) | |
tree | 6afe48a8bd53bac805e6ae19dd58f6843af5ccf1 /apps/wps.c | |
parent | 86587527f52db8320f8d8ea48dfc76d3d93d79c8 (diff) | |
download | rockbox-28cce684a3f433200e5257eb929ee8d7a63b67ff.tar.gz rockbox-28cce684a3f433200e5257eb929ee8d7a63b67ff.zip |
Changed remote control button events to separate codes. Now the remote control works while keys are locked.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@3586 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/wps.c')
-rw-r--r-- | apps/wps.c | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/apps/wps.c b/apps/wps.c index 0fbe8d713e..a82ebc1a80 100644 --- a/apps/wps.c +++ b/apps/wps.c | |||
@@ -574,7 +574,7 @@ static bool menu(void) | |||
574 | case BUTTON_MENU | BUTTON_REL: | 574 | case BUTTON_MENU | BUTTON_REL: |
575 | #endif | 575 | #endif |
576 | exit = true; | 576 | exit = true; |
577 | if ( !last_button ) { | 577 | if ( !last_button && !keys_locked ) { |
578 | lcd_stop_scroll(); | 578 | lcd_stop_scroll(); |
579 | 579 | ||
580 | if (main_menu()) | 580 | if (main_menu()) |
@@ -807,6 +807,13 @@ int wps_show(void) | |||
807 | continue; | 807 | continue; |
808 | } | 808 | } |
809 | 809 | ||
810 | /* ignore non-remote buttons when keys are locked */ | ||
811 | if (keys_locked && | ||
812 | ! ((button & BUTTON_F1) || | ||
813 | (button == SYS_USB_CONNECTED) || | ||
814 | (button & BUTTON_REMOTE))) | ||
815 | continue; | ||
816 | |||
810 | switch(button) | 817 | switch(button) |
811 | { | 818 | { |
812 | case BUTTON_ON: | 819 | case BUTTON_ON: |
@@ -848,6 +855,7 @@ int wps_show(void) | |||
848 | 855 | ||
849 | /* play/pause */ | 856 | /* play/pause */ |
850 | case BUTTON_PLAY: | 857 | case BUTTON_PLAY: |
858 | case BUTTON_RC_PLAY: | ||
851 | if ( paused ) | 859 | if ( paused ) |
852 | { | 860 | { |
853 | paused = false; | 861 | paused = false; |
@@ -879,7 +887,7 @@ int wps_show(void) | |||
879 | case BUTTON_UP: | 887 | case BUTTON_UP: |
880 | case BUTTON_UP | BUTTON_REPEAT: | 888 | case BUTTON_UP | BUTTON_REPEAT: |
881 | #endif | 889 | #endif |
882 | case BUTTON_VOL_UP: | 890 | case BUTTON_RC_VOL_UP: |
883 | global_settings.volume++; | 891 | global_settings.volume++; |
884 | if(global_settings.volume > mpeg_sound_max(SOUND_VOLUME)) | 892 | if(global_settings.volume > mpeg_sound_max(SOUND_VOLUME)) |
885 | global_settings.volume = mpeg_sound_max(SOUND_VOLUME); | 893 | global_settings.volume = mpeg_sound_max(SOUND_VOLUME); |
@@ -893,7 +901,7 @@ int wps_show(void) | |||
893 | case BUTTON_DOWN: | 901 | case BUTTON_DOWN: |
894 | case BUTTON_DOWN | BUTTON_REPEAT: | 902 | case BUTTON_DOWN | BUTTON_REPEAT: |
895 | #endif | 903 | #endif |
896 | case BUTTON_VOL_DOWN: | 904 | case BUTTON_RC_VOL_DOWN: |
897 | global_settings.volume--; | 905 | global_settings.volume--; |
898 | if(global_settings.volume < mpeg_sound_min(SOUND_VOLUME)) | 906 | if(global_settings.volume < mpeg_sound_min(SOUND_VOLUME)) |
899 | global_settings.volume = mpeg_sound_min(SOUND_VOLUME); | 907 | global_settings.volume = mpeg_sound_min(SOUND_VOLUME); |
@@ -909,6 +917,7 @@ int wps_show(void) | |||
909 | break; | 917 | break; |
910 | 918 | ||
911 | /* prev / restart */ | 919 | /* prev / restart */ |
920 | case BUTTON_RC_LEFT: | ||
912 | case BUTTON_LEFT | BUTTON_REL: | 921 | case BUTTON_LEFT | BUTTON_REL: |
913 | #ifdef HAVE_RECORDER_KEYPAD | 922 | #ifdef HAVE_RECORDER_KEYPAD |
914 | if ( lastbutton != BUTTON_LEFT ) | 923 | if ( lastbutton != BUTTON_LEFT ) |
@@ -929,6 +938,7 @@ int wps_show(void) | |||
929 | break; | 938 | break; |
930 | 939 | ||
931 | /* next */ | 940 | /* next */ |
941 | case BUTTON_RC_RIGHT: | ||
932 | case BUTTON_RIGHT | BUTTON_REL: | 942 | case BUTTON_RIGHT | BUTTON_REL: |
933 | #ifdef HAVE_RECORDER_KEYPAD | 943 | #ifdef HAVE_RECORDER_KEYPAD |
934 | if ( lastbutton != BUTTON_RIGHT ) | 944 | if ( lastbutton != BUTTON_RIGHT ) |
@@ -973,6 +983,7 @@ int wps_show(void) | |||
973 | #ifdef HAVE_RECORDER_KEYPAD | 983 | #ifdef HAVE_RECORDER_KEYPAD |
974 | case BUTTON_OFF: | 984 | case BUTTON_OFF: |
975 | #else | 985 | #else |
986 | case BUTTON_RC_STOP: | ||
976 | case BUTTON_STOP | BUTTON_REL: | 987 | case BUTTON_STOP | BUTTON_REL: |
977 | if ( lastbutton != BUTTON_STOP ) | 988 | if ( lastbutton != BUTTON_STOP ) |
978 | break; | 989 | break; |