From 8190b5d3476f986ebf59374319feae3bc6c68904 Mon Sep 17 00:00:00 2001 From: Björn Stenberg Date: Tue, 20 May 2003 12:15:09 +0000 Subject: 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 --- apps/tree.c | 4 ++-- apps/wps.c | 10 ++++++---- 2 files changed, 8 insertions(+), 6 deletions(-) (limited to 'apps') 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) case TREE_PREV: case TREE_PREV | BUTTON_REPEAT: - case BUTTON_RC_VOL_UP: + case BUTTON_RC_LEFT: if(filesindir) { if(dircursor) { put_cursorxy(CURSOR_X, CURSOR_Y + dircursor, false); @@ -1053,7 +1053,7 @@ bool dirbrowse(char *root) case TREE_NEXT: case TREE_NEXT | BUTTON_REPEAT: - case BUTTON_RC_VOL_DOWN: + case BUTTON_RC_RIGHT: if(filesindir) { 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) case BUTTON_RC_LEFT: case BUTTON_LEFT | BUTTON_REL: #ifdef HAVE_RECORDER_KEYPAD - if ( lastbutton != BUTTON_LEFT ) - break; + if ((button == (BUTTON_LEFT | BUTTON_REL)) && + (lastbutton != BUTTON_LEFT )) + break; #endif if (!id3 || (id3->elapsed < 3*1000)) { mpeg_prev(); @@ -945,7 +946,8 @@ int wps_show(void) case BUTTON_RC_RIGHT: case BUTTON_RIGHT | BUTTON_REL: #ifdef HAVE_RECORDER_KEYPAD - if ( lastbutton != BUTTON_RIGHT ) + if ((button == (BUTTON_RIGHT | BUTTON_REL)) && + (lastbutton != BUTTON_RIGHT)) break; #endif mpeg_next(); @@ -984,10 +986,10 @@ int wps_show(void) #endif /* stop and exit wps */ + case BUTTON_RC_STOP: #ifdef HAVE_RECORDER_KEYPAD case BUTTON_OFF: #else - case BUTTON_RC_STOP: case BUTTON_STOP | BUTTON_REL: if ( lastbutton != BUTTON_STOP ) break; -- cgit v1.2.3