software keylock works again

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10632 a1c6a512-1295-4272-9138-f99709370657

3 files changed, 8 insertions, 20 deletions

diff --git a/apps/gui/gwps.c b/apps/gui/gwps.c
index 12e120f7d4..06e7ae4aed 100644
--- a/apps/gui/gwps.c
+++ b/apps/gui/gwps.c
@@ -65,8 +65,6 @@ struct wps_state wps_state;
 struct gui_wps gui_wps[NB_SCREENS];
 static struct wps_data wps_datas[NB_SCREENS];
 
-bool keys_locked = false;
-
 /* change the path to the current played track */
 static void wps_state_update_ctp(const char *path);
 
@@ -163,7 +161,7 @@ long gui_wps_show(void)
             long next_big_refresh = current_tick + HZ / 5;
             button = BUTTON_NONE;
             while (TIME_BEFORE(current_tick, next_big_refresh)) {
-                button = get_action(CONTEXT_WPS,TIMEOUT_NOBLOCK);
+                button = get_action(CONTEXT_WPS|ALLOW_SOFTLOCK,TIMEOUT_NOBLOCK);
                 if (button != ACTION_NONE) {
                     break;
                 }
@@ -186,10 +184,10 @@ long gui_wps_show(void)
         /* The peak meter is disabled
            -> no additional screen updates needed */
         else {
-            button = get_action(CONTEXT_WPS,HZ/5);
+            button = get_action(CONTEXT_WPS|ALLOW_SOFTLOCK,HZ/5);
         }
 #else
-        button = get_action(CONTEXT_WPS,HZ/5);
+        button = get_action(CONTEXT_WPS|ALLOW_SOFTLOCK,HZ/5);
 #endif
 
         /* Exit if audio has stopped playing. This can happen if using the
@@ -426,13 +424,6 @@ long gui_wps_show(void)
                 restore = true;
                 break;
 
-            /* key lock */
-            case ACTION_STD_KEYLOCK:
-                action_setsoftwarekeylock(ACTION_STD_KEYLOCK,true);
-                display_keylock_text(true);
-                restore = true;
-                break;
-
 
 #ifdef HAVE_QUICKSCREEN
             case ACTION_WPS_QUICKSCREEN:
@@ -542,6 +533,9 @@ long gui_wps_show(void)
                 restore = true;
                 break;
 
+            case ACTION_REDRAW: /* yes are locked, just redraw */
+                restore = true;
+                break;
             case ACTION_NONE: /* Timeout */
                 update_track = true;
                 ffwd_rew(button); /* hopefully fix the ffw/rwd bug */
@@ -599,10 +593,6 @@ long gui_wps_show(void)
             ab_reset_markers();
 #endif
 
-            /* Keys can be locked when exiting, so either unlock here
-               or implement key locking in tree.c too */
-            keys_locked=false;
-
             /* set dir browser to current playing song */
             if (global_settings.browse_current &&
                 wps_state.current_track_path[0] != '\0')
diff --git a/apps/gui/gwps.h b/apps/gui/gwps.h
index 5b27696dd8..2c9638d5c9 100644
--- a/apps/gui/gwps.h
+++ b/apps/gui/gwps.h
@@ -318,8 +318,6 @@
 #define WPS_ALIGN_CENTER 64
 #define WPS_ALIGN_LEFT 128
 
-
-extern bool keys_locked;
 /* wps_data*/
 
 #ifdef HAVE_LCD_BITMAP
diff --git a/apps/gui/statusbar.c b/apps/gui/statusbar.c
index cceb54ede6..cbd1709bbc 100644
--- a/apps/gui/statusbar.c
+++ b/apps/gui/statusbar.c
@@ -34,7 +34,7 @@
 #include "led.h"
 
 #include "status.h" /* needed for battery_state global var */
-#include "gwps.h" /* for keys_locked */
+#include "action.h" /* for keys_locked */
 #include "statusbar.h"
 
 
@@ -178,7 +178,7 @@ void gui_statusbar_draw(struct gui_statusbar * bar, bool force_redraw)
 #ifdef HAS_BUTTON_HOLD
     bar->info.keylock = button_hold();
 #else
-    bar->info.keylock = keys_locked;
+    bar->info.keylock = is_keys_locked();
 #endif /* HAS_BUTTON_HOLD */
 #ifdef HAS_REMOTE_BUTTON_HOLD
     bar->info.keylockremote = remote_button_hold();