diff options
author | Björn Stenberg <bjorn@haxx.se> | 2003-05-20 12:15:09 +0000 |
---|---|---|
committer | Björn Stenberg <bjorn@haxx.se> | 2003-05-20 12:15:09 +0000 |
commit | 8190b5d3476f986ebf59374319feae3bc6c68904 (patch) | |
tree | 25ef183265830e7687319ea704a24f559f3224f7 /apps/wps.c | |
parent | b7a839832be54b59d15ec9c0c60c0a14095d317c (diff) | |
download | rockbox-8190b5d3476f986ebf59374319feae3bc6c68904.tar.gz rockbox-8190b5d3476f986ebf59374319feae3bc6c68904.zip |
Fixed bad remote control handling in wps. Changed tree navigation keys to right/left (was vol +/-)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@3688 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/wps.c')
-rw-r--r-- | apps/wps.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/apps/wps.c b/apps/wps.c index 187f244775..ef8b59fea8 100644 --- a/apps/wps.c +++ b/apps/wps.c | |||
@@ -924,8 +924,9 @@ int wps_show(void) | |||
924 | case BUTTON_RC_LEFT: | 924 | case BUTTON_RC_LEFT: |
925 | case BUTTON_LEFT | BUTTON_REL: | 925 | case BUTTON_LEFT | BUTTON_REL: |
926 | #ifdef HAVE_RECORDER_KEYPAD | 926 | #ifdef HAVE_RECORDER_KEYPAD |
927 | if ( lastbutton != BUTTON_LEFT ) | 927 | if ((button == (BUTTON_LEFT | BUTTON_REL)) && |
928 | break; | 928 | (lastbutton != BUTTON_LEFT )) |
929 | break; | ||
929 | #endif | 930 | #endif |
930 | if (!id3 || (id3->elapsed < 3*1000)) { | 931 | if (!id3 || (id3->elapsed < 3*1000)) { |
931 | mpeg_prev(); | 932 | mpeg_prev(); |
@@ -945,7 +946,8 @@ int wps_show(void) | |||
945 | case BUTTON_RC_RIGHT: | 946 | case BUTTON_RC_RIGHT: |
946 | case BUTTON_RIGHT | BUTTON_REL: | 947 | case BUTTON_RIGHT | BUTTON_REL: |
947 | #ifdef HAVE_RECORDER_KEYPAD | 948 | #ifdef HAVE_RECORDER_KEYPAD |
948 | if ( lastbutton != BUTTON_RIGHT ) | 949 | if ((button == (BUTTON_RIGHT | BUTTON_REL)) && |
950 | (lastbutton != BUTTON_RIGHT)) | ||
949 | break; | 951 | break; |
950 | #endif | 952 | #endif |
951 | mpeg_next(); | 953 | mpeg_next(); |
@@ -984,10 +986,10 @@ int wps_show(void) | |||
984 | #endif | 986 | #endif |
985 | 987 | ||
986 | /* stop and exit wps */ | 988 | /* stop and exit wps */ |
989 | case BUTTON_RC_STOP: | ||
987 | #ifdef HAVE_RECORDER_KEYPAD | 990 | #ifdef HAVE_RECORDER_KEYPAD |
988 | case BUTTON_OFF: | 991 | case BUTTON_OFF: |
989 | #else | 992 | #else |
990 | case BUTTON_RC_STOP: | ||
991 | case BUTTON_STOP | BUTTON_REL: | 993 | case BUTTON_STOP | BUTTON_REL: |
992 | if ( lastbutton != BUTTON_STOP ) | 994 | if ( lastbutton != BUTTON_STOP ) |
993 | break; | 995 | break; |