devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Player volume buttons now work again

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@5163 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Björn Stenberg 2004-10-04 22:35:12 +00:00
parent a15386bb9d
commit 305aaf29f3
1 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

18
apps/wps.c
View file

@ -64,7 +64,9 @@ static char current_track_path[MAX_PATH+1];
/* button definitions */ /* button definitions */
#if CONFIG_KEYPAD == RECORDER_PAD #if CONFIG_KEYPAD == RECORDER_PAD
#define WPS_NEXT (BUTTON_RIGHT | BUTTON_REL) #define WPS_NEXT (BUTTON_RIGHT | BUTTON_REL)
#define WPS_NEXT_PRE BUTTON_RIGHT
#define WPS_PREV (BUTTON_LEFT | BUTTON_REL) #define WPS_PREV (BUTTON_LEFT | BUTTON_REL)
#define WPS_PREV_PRE BUTTON_LEFT
#define WPS_FFWD (BUTTON_RIGHT | BUTTON_REPEAT) #define WPS_FFWD (BUTTON_RIGHT | BUTTON_REPEAT)
#define WPS_REW (BUTTON_LEFT | BUTTON_REPEAT) #define WPS_REW (BUTTON_LEFT | BUTTON_REPEAT)
#define WPS_INCVOL BUTTON_UP #define WPS_INCVOL BUTTON_UP
@ -86,7 +88,9 @@ static char current_track_path[MAX_PATH+1];
#elif CONFIG_KEYPAD == PLAYER_PAD #elif CONFIG_KEYPAD == PLAYER_PAD
#define WPS_NEXT (BUTTON_RIGHT | BUTTON_REL) #define WPS_NEXT (BUTTON_RIGHT | BUTTON_REL)
#define WPS_NEXT_PRE BUTTON_RIGHT
#define WPS_PREV (BUTTON_LEFT | BUTTON_REL) #define WPS_PREV (BUTTON_LEFT | BUTTON_REL)
#define WPS_PREV_PRE BUTTON_LEFT
#define WPS_FFWD (BUTTON_RIGHT | BUTTON_REPEAT) #define WPS_FFWD (BUTTON_RIGHT | BUTTON_REPEAT)
#define WPS_REW (BUTTON_LEFT | BUTTON_REPEAT) #define WPS_REW (BUTTON_LEFT | BUTTON_REPEAT)
#define WPS_INCVOL (BUTTON_MENU | BUTTON_RIGHT) #define WPS_INCVOL (BUTTON_MENU | BUTTON_RIGHT)
@ -108,7 +112,9 @@ static char current_track_path[MAX_PATH+1];
#elif CONFIG_KEYPAD == ONDIO_PAD #elif CONFIG_KEYPAD == ONDIO_PAD
#define WPS_NEXT (BUTTON_RIGHT | BUTTON_REL) #define WPS_NEXT (BUTTON_RIGHT | BUTTON_REL)
#define WPS_NEXT_PRE BUTTON_RIGHT
#define WPS_PREV (BUTTON_LEFT | BUTTON_REL) #define WPS_PREV (BUTTON_LEFT | BUTTON_REL)
#define WPS_PREV_PRE BUTTON_LEFT
#define WPS_FFWD (BUTTON_RIGHT | BUTTON_REPEAT) #define WPS_FFWD (BUTTON_RIGHT | BUTTON_REPEAT)
#define WPS_REW (BUTTON_LEFT | BUTTON_REPEAT) #define WPS_REW (BUTTON_LEFT | BUTTON_REPEAT)
#define WPS_INCVOL BUTTON_UP #define WPS_INCVOL BUTTON_UP
@ -608,10 +614,10 @@ int wps_show(void)
case WPS_RC_PREV: case WPS_RC_PREV:
#endif #endif
case WPS_PREV: case WPS_PREV:
/* ignore release event after rewind */ #ifdef WPS_PREV_PRE
if (lastbutton & BUTTON_REPEAT) if (lastbutton != WPS_PREV_PRE)
break; break;
#endif
if (!id3 || (id3->elapsed < 3*1000)) { if (!id3 || (id3->elapsed < 3*1000)) {
mpeg_prev(); mpeg_prev();
} }
@ -631,8 +637,8 @@ int wps_show(void)
case WPS_RC_NEXT: case WPS_RC_NEXT:
#endif #endif
case WPS_NEXT: case WPS_NEXT:
#if CONFIG_KEYPAD == RECORDER_PAD #ifdef WPS_NEXT_PRE
if (lastbutton & BUTTON_REPEAT) if (lastbutton != WPS_NEXT_PRE)
break; break;
#endif #endif
mpeg_next(); mpeg_next();