From 305aaf29f388979a6c4edb625bc51b122e8357d7 Mon Sep 17 00:00:00 2001 From: Björn Stenberg Date: Mon, 4 Oct 2004 22:35:12 +0000 Subject: Player volume buttons now work again git-svn-id: svn://svn.rockbox.org/rockbox/trunk@5163 a1c6a512-1295-4272-9138-f99709370657 --- apps/wps.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/apps/wps.c b/apps/wps.c index c8a197ea83..e93b20d141 100644 --- a/apps/wps.c +++ b/apps/wps.c @@ -64,7 +64,9 @@ static char current_track_path[MAX_PATH+1]; /* button definitions */ #if CONFIG_KEYPAD == RECORDER_PAD #define WPS_NEXT (BUTTON_RIGHT | BUTTON_REL) +#define WPS_NEXT_PRE BUTTON_RIGHT #define WPS_PREV (BUTTON_LEFT | BUTTON_REL) +#define WPS_PREV_PRE BUTTON_LEFT #define WPS_FFWD (BUTTON_RIGHT | BUTTON_REPEAT) #define WPS_REW (BUTTON_LEFT | BUTTON_REPEAT) #define WPS_INCVOL BUTTON_UP @@ -86,7 +88,9 @@ static char current_track_path[MAX_PATH+1]; #elif CONFIG_KEYPAD == PLAYER_PAD #define WPS_NEXT (BUTTON_RIGHT | BUTTON_REL) +#define WPS_NEXT_PRE BUTTON_RIGHT #define WPS_PREV (BUTTON_LEFT | BUTTON_REL) +#define WPS_PREV_PRE BUTTON_LEFT #define WPS_FFWD (BUTTON_RIGHT | BUTTON_REPEAT) #define WPS_REW (BUTTON_LEFT | BUTTON_REPEAT) #define WPS_INCVOL (BUTTON_MENU | BUTTON_RIGHT) @@ -108,7 +112,9 @@ static char current_track_path[MAX_PATH+1]; #elif CONFIG_KEYPAD == ONDIO_PAD #define WPS_NEXT (BUTTON_RIGHT | BUTTON_REL) +#define WPS_NEXT_PRE BUTTON_RIGHT #define WPS_PREV (BUTTON_LEFT | BUTTON_REL) +#define WPS_PREV_PRE BUTTON_LEFT #define WPS_FFWD (BUTTON_RIGHT | BUTTON_REPEAT) #define WPS_REW (BUTTON_LEFT | BUTTON_REPEAT) #define WPS_INCVOL BUTTON_UP @@ -608,10 +614,10 @@ int wps_show(void) case WPS_RC_PREV: #endif case WPS_PREV: - /* ignore release event after rewind */ - if (lastbutton & BUTTON_REPEAT) - break; - +#ifdef WPS_PREV_PRE + if (lastbutton != WPS_PREV_PRE) + break; +#endif if (!id3 || (id3->elapsed < 3*1000)) { mpeg_prev(); } @@ -631,8 +637,8 @@ int wps_show(void) case WPS_RC_NEXT: #endif case WPS_NEXT: -#if CONFIG_KEYPAD == RECORDER_PAD - if (lastbutton & BUTTON_REPEAT) +#ifdef WPS_NEXT_PRE + if (lastbutton != WPS_NEXT_PRE) break; #endif mpeg_next(); -- cgit v1.2.3