diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/tree.c | 4 | ||||
-rw-r--r-- | apps/wps.c | 10 |
2 files changed, 8 insertions, 6 deletions
diff --git a/apps/tree.c b/apps/tree.c index 0826bbc6ba..4499863ae2 100644 --- a/apps/tree.c +++ b/apps/tree.c | |||
@@ -1015,7 +1015,7 @@ bool dirbrowse(char *root) | |||
1015 | 1015 | ||
1016 | case TREE_PREV: | 1016 | case TREE_PREV: |
1017 | case TREE_PREV | BUTTON_REPEAT: | 1017 | case TREE_PREV | BUTTON_REPEAT: |
1018 | case BUTTON_RC_VOL_UP: | 1018 | case BUTTON_RC_LEFT: |
1019 | if(filesindir) { | 1019 | if(filesindir) { |
1020 | if(dircursor) { | 1020 | if(dircursor) { |
1021 | put_cursorxy(CURSOR_X, CURSOR_Y + dircursor, false); | 1021 | put_cursorxy(CURSOR_X, CURSOR_Y + dircursor, false); |
@@ -1053,7 +1053,7 @@ bool dirbrowse(char *root) | |||
1053 | 1053 | ||
1054 | case TREE_NEXT: | 1054 | case TREE_NEXT: |
1055 | case TREE_NEXT | BUTTON_REPEAT: | 1055 | case TREE_NEXT | BUTTON_REPEAT: |
1056 | case BUTTON_RC_VOL_DOWN: | 1056 | case BUTTON_RC_RIGHT: |
1057 | if(filesindir) | 1057 | if(filesindir) |
1058 | { | 1058 | { |
1059 | if (dircursor + dirstart + 1 < numentries ) { | 1059 | if (dircursor + dirstart + 1 < numentries ) { |
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; |