summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Martitz <kugel@rockbox.org>2009-11-14 20:07:31 +0000
committerThomas Martitz <kugel@rockbox.org>2009-11-14 20:07:31 +0000
commit2e82199fede62367f07dd135c6127b1a93d0a35e (patch)
tree71f776677e392a2744d1f692c887ce1ffa211f42
parent6d932850878b6734a4570ad01369240acdd33fe3 (diff)
downloadrockbox-2e82199fede62367f07dd135c6127b1a93d0a35e.zip
rockbox-2e82199fede62367f07dd135c6127b1a93d0a35e.tar.gz
rockbox-2e82199fede62367f07dd135c6127b1a93d0a35e.tar.bz2
rockbox-2e82199fede62367f07dd135c6127b1a93d0a35e.tar.xz
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
-rw-r--r--apps/gui/wps.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/apps/gui/wps.c b/apps/gui/wps.c
index d2c1361..cc6bd60 100644
--- a/apps/gui/wps.c
+++ b/apps/gui/wps.c
@@ -745,7 +745,10 @@ long gui_wps_show(void)
button = BUTTON_NONE;
while (TIME_BEFORE(current_tick, next_big_refresh)) {
button = get_action(CONTEXT_WPS|ALLOW_SOFTLOCK,TIMEOUT_NOBLOCK);
- if (button != ACTION_NONE) {
+ /* check for restore to not let the peakmeter delay the
+ * initial draw of the wps, don't delay handling of button
+ * presses either */
+ if (button != ACTION_NONE || restore) {
break;
}
peak_meter_peek();
@@ -769,7 +772,7 @@ long gui_wps_show(void)
#endif
{
button = get_action(CONTEXT_WPS|ALLOW_SOFTLOCK,
- restore ? HZ/100 : HZ/5);
+ restore ? TIMEOUT_NOBLOCK : HZ/5);
}
/* Exit if audio has stopped playing. This happens e.g. at end of