diff options
author | Thomas Martitz <kugel@rockbox.org> | 2009-11-14 20:07:31 +0000 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2009-11-14 20:07:31 +0000 |
commit | 2e82199fede62367f07dd135c6127b1a93d0a35e (patch) | |
tree | 71f776677e392a2744d1f692c887ce1ffa211f42 /apps | |
parent | 6d932850878b6734a4570ad01369240acdd33fe3 (diff) | |
download | rockbox-2e82199fede62367f07dd135c6127b1a93d0a35e.tar.gz rockbox-2e82199fede62367f07dd135c6127b1a93d0a35e.zip |
Fix peakmeter from delaying the initial display of the wps. Also change HZ/100 to TIMEOUT_NOBLOCK which is more appropriater in the get_action() call below.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23625 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r-- | apps/gui/wps.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/apps/gui/wps.c b/apps/gui/wps.c index d2c1361a44..cc6bd60ef5 100644 --- a/apps/gui/wps.c +++ b/apps/gui/wps.c | |||
@@ -745,7 +745,10 @@ long gui_wps_show(void) | |||
745 | button = BUTTON_NONE; | 745 | button = BUTTON_NONE; |
746 | while (TIME_BEFORE(current_tick, next_big_refresh)) { | 746 | while (TIME_BEFORE(current_tick, next_big_refresh)) { |
747 | button = get_action(CONTEXT_WPS|ALLOW_SOFTLOCK,TIMEOUT_NOBLOCK); | 747 | button = get_action(CONTEXT_WPS|ALLOW_SOFTLOCK,TIMEOUT_NOBLOCK); |
748 | if (button != ACTION_NONE) { | 748 | /* check for restore to not let the peakmeter delay the |
749 | * initial draw of the wps, don't delay handling of button | ||
750 | * presses either */ | ||
751 | if (button != ACTION_NONE || restore) { | ||
749 | break; | 752 | break; |
750 | } | 753 | } |
751 | peak_meter_peek(); | 754 | peak_meter_peek(); |
@@ -769,7 +772,7 @@ long gui_wps_show(void) | |||
769 | #endif | 772 | #endif |
770 | { | 773 | { |
771 | button = get_action(CONTEXT_WPS|ALLOW_SOFTLOCK, | 774 | button = get_action(CONTEXT_WPS|ALLOW_SOFTLOCK, |
772 | restore ? HZ/100 : HZ/5); | 775 | restore ? TIMEOUT_NOBLOCK : HZ/5); |
773 | } | 776 | } |
774 | 777 | ||
775 | /* Exit if audio has stopped playing. This happens e.g. at end of | 778 | /* Exit if audio has stopped playing. This happens e.g. at end of |