forked from len0rd/rockbox
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
This commit is contained in:
parent
b7a839832b
commit
8190b5d347
2 changed files with 8 additions and 6 deletions
|
|
@ -1015,7 +1015,7 @@ bool dirbrowse(char *root)
|
||||||
|
|
||||||
case TREE_PREV:
|
case TREE_PREV:
|
||||||
case TREE_PREV | BUTTON_REPEAT:
|
case TREE_PREV | BUTTON_REPEAT:
|
||||||
case BUTTON_RC_VOL_UP:
|
case BUTTON_RC_LEFT:
|
||||||
if(filesindir) {
|
if(filesindir) {
|
||||||
if(dircursor) {
|
if(dircursor) {
|
||||||
put_cursorxy(CURSOR_X, CURSOR_Y + dircursor, false);
|
put_cursorxy(CURSOR_X, CURSOR_Y + dircursor, false);
|
||||||
|
|
@ -1053,7 +1053,7 @@ bool dirbrowse(char *root)
|
||||||
|
|
||||||
case TREE_NEXT:
|
case TREE_NEXT:
|
||||||
case TREE_NEXT | BUTTON_REPEAT:
|
case TREE_NEXT | BUTTON_REPEAT:
|
||||||
case BUTTON_RC_VOL_DOWN:
|
case BUTTON_RC_RIGHT:
|
||||||
if(filesindir)
|
if(filesindir)
|
||||||
{
|
{
|
||||||
if (dircursor + dirstart + 1 < numentries ) {
|
if (dircursor + dirstart + 1 < numentries ) {
|
||||||
|
|
|
||||||
10
apps/wps.c
10
apps/wps.c
|
|
@ -924,8 +924,9 @@ int wps_show(void)
|
||||||
case BUTTON_RC_LEFT:
|
case BUTTON_RC_LEFT:
|
||||||
case BUTTON_LEFT | BUTTON_REL:
|
case BUTTON_LEFT | BUTTON_REL:
|
||||||
#ifdef HAVE_RECORDER_KEYPAD
|
#ifdef HAVE_RECORDER_KEYPAD
|
||||||
if ( lastbutton != BUTTON_LEFT )
|
if ((button == (BUTTON_LEFT | BUTTON_REL)) &&
|
||||||
break;
|
(lastbutton != BUTTON_LEFT ))
|
||||||
|
break;
|
||||||
#endif
|
#endif
|
||||||
if (!id3 || (id3->elapsed < 3*1000)) {
|
if (!id3 || (id3->elapsed < 3*1000)) {
|
||||||
mpeg_prev();
|
mpeg_prev();
|
||||||
|
|
@ -945,7 +946,8 @@ int wps_show(void)
|
||||||
case BUTTON_RC_RIGHT:
|
case BUTTON_RC_RIGHT:
|
||||||
case BUTTON_RIGHT | BUTTON_REL:
|
case BUTTON_RIGHT | BUTTON_REL:
|
||||||
#ifdef HAVE_RECORDER_KEYPAD
|
#ifdef HAVE_RECORDER_KEYPAD
|
||||||
if ( lastbutton != BUTTON_RIGHT )
|
if ((button == (BUTTON_RIGHT | BUTTON_REL)) &&
|
||||||
|
(lastbutton != BUTTON_RIGHT))
|
||||||
break;
|
break;
|
||||||
#endif
|
#endif
|
||||||
mpeg_next();
|
mpeg_next();
|
||||||
|
|
@ -984,10 +986,10 @@ int wps_show(void)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* stop and exit wps */
|
/* stop and exit wps */
|
||||||
|
case BUTTON_RC_STOP:
|
||||||
#ifdef HAVE_RECORDER_KEYPAD
|
#ifdef HAVE_RECORDER_KEYPAD
|
||||||
case BUTTON_OFF:
|
case BUTTON_OFF:
|
||||||
#else
|
#else
|
||||||
case BUTTON_RC_STOP:
|
|
||||||
case BUTTON_STOP | BUTTON_REL:
|
case BUTTON_STOP | BUTTON_REL:
|
||||||
if ( lastbutton != BUTTON_STOP )
|
if ( lastbutton != BUTTON_STOP )
|
||||||
break;
|
break;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue