diff options
author | Björn Stenberg <bjorn@haxx.se> | 2004-10-04 22:35:12 +0000 |
---|---|---|
committer | Björn Stenberg <bjorn@haxx.se> | 2004-10-04 22:35:12 +0000 |
commit | 305aaf29f388979a6c4edb625bc51b122e8357d7 (patch) | |
tree | 1f2e86fb0a86f58fdd52ae5f1bc24a47d9f7d89d /apps | |
parent | a15386bb9d676833f2743dcc6624ab22899c8198 (diff) | |
download | rockbox-305aaf29f388979a6c4edb625bc51b122e8357d7.tar.gz rockbox-305aaf29f388979a6c4edb625bc51b122e8357d7.zip |
Player volume buttons now work again
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@5163 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r-- | apps/wps.c | 18 |
1 files 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]; | |||
64 | /* button definitions */ | 64 | /* button definitions */ |
65 | #if CONFIG_KEYPAD == RECORDER_PAD | 65 | #if CONFIG_KEYPAD == RECORDER_PAD |
66 | #define WPS_NEXT (BUTTON_RIGHT | BUTTON_REL) | 66 | #define WPS_NEXT (BUTTON_RIGHT | BUTTON_REL) |
67 | #define WPS_NEXT_PRE BUTTON_RIGHT | ||
67 | #define WPS_PREV (BUTTON_LEFT | BUTTON_REL) | 68 | #define WPS_PREV (BUTTON_LEFT | BUTTON_REL) |
69 | #define WPS_PREV_PRE BUTTON_LEFT | ||
68 | #define WPS_FFWD (BUTTON_RIGHT | BUTTON_REPEAT) | 70 | #define WPS_FFWD (BUTTON_RIGHT | BUTTON_REPEAT) |
69 | #define WPS_REW (BUTTON_LEFT | BUTTON_REPEAT) | 71 | #define WPS_REW (BUTTON_LEFT | BUTTON_REPEAT) |
70 | #define WPS_INCVOL BUTTON_UP | 72 | #define WPS_INCVOL BUTTON_UP |
@@ -86,7 +88,9 @@ static char current_track_path[MAX_PATH+1]; | |||
86 | 88 | ||
87 | #elif CONFIG_KEYPAD == PLAYER_PAD | 89 | #elif CONFIG_KEYPAD == PLAYER_PAD |
88 | #define WPS_NEXT (BUTTON_RIGHT | BUTTON_REL) | 90 | #define WPS_NEXT (BUTTON_RIGHT | BUTTON_REL) |
91 | #define WPS_NEXT_PRE BUTTON_RIGHT | ||
89 | #define WPS_PREV (BUTTON_LEFT | BUTTON_REL) | 92 | #define WPS_PREV (BUTTON_LEFT | BUTTON_REL) |
93 | #define WPS_PREV_PRE BUTTON_LEFT | ||
90 | #define WPS_FFWD (BUTTON_RIGHT | BUTTON_REPEAT) | 94 | #define WPS_FFWD (BUTTON_RIGHT | BUTTON_REPEAT) |
91 | #define WPS_REW (BUTTON_LEFT | BUTTON_REPEAT) | 95 | #define WPS_REW (BUTTON_LEFT | BUTTON_REPEAT) |
92 | #define WPS_INCVOL (BUTTON_MENU | BUTTON_RIGHT) | 96 | #define WPS_INCVOL (BUTTON_MENU | BUTTON_RIGHT) |
@@ -108,7 +112,9 @@ static char current_track_path[MAX_PATH+1]; | |||
108 | 112 | ||
109 | #elif CONFIG_KEYPAD == ONDIO_PAD | 113 | #elif CONFIG_KEYPAD == ONDIO_PAD |
110 | #define WPS_NEXT (BUTTON_RIGHT | BUTTON_REL) | 114 | #define WPS_NEXT (BUTTON_RIGHT | BUTTON_REL) |
115 | #define WPS_NEXT_PRE BUTTON_RIGHT | ||
111 | #define WPS_PREV (BUTTON_LEFT | BUTTON_REL) | 116 | #define WPS_PREV (BUTTON_LEFT | BUTTON_REL) |
117 | #define WPS_PREV_PRE BUTTON_LEFT | ||
112 | #define WPS_FFWD (BUTTON_RIGHT | BUTTON_REPEAT) | 118 | #define WPS_FFWD (BUTTON_RIGHT | BUTTON_REPEAT) |
113 | #define WPS_REW (BUTTON_LEFT | BUTTON_REPEAT) | 119 | #define WPS_REW (BUTTON_LEFT | BUTTON_REPEAT) |
114 | #define WPS_INCVOL BUTTON_UP | 120 | #define WPS_INCVOL BUTTON_UP |
@@ -608,10 +614,10 @@ int wps_show(void) | |||
608 | case WPS_RC_PREV: | 614 | case WPS_RC_PREV: |
609 | #endif | 615 | #endif |
610 | case WPS_PREV: | 616 | case WPS_PREV: |
611 | /* ignore release event after rewind */ | 617 | #ifdef WPS_PREV_PRE |
612 | if (lastbutton & BUTTON_REPEAT) | 618 | if (lastbutton != WPS_PREV_PRE) |
613 | break; | 619 | break; |
614 | 620 | #endif | |
615 | if (!id3 || (id3->elapsed < 3*1000)) { | 621 | if (!id3 || (id3->elapsed < 3*1000)) { |
616 | mpeg_prev(); | 622 | mpeg_prev(); |
617 | } | 623 | } |
@@ -631,8 +637,8 @@ int wps_show(void) | |||
631 | case WPS_RC_NEXT: | 637 | case WPS_RC_NEXT: |
632 | #endif | 638 | #endif |
633 | case WPS_NEXT: | 639 | case WPS_NEXT: |
634 | #if CONFIG_KEYPAD == RECORDER_PAD | 640 | #ifdef WPS_NEXT_PRE |
635 | if (lastbutton & BUTTON_REPEAT) | 641 | if (lastbutton != WPS_NEXT_PRE) |
636 | break; | 642 | break; |
637 | #endif | 643 | #endif |
638 | mpeg_next(); | 644 | mpeg_next(); |