summaryrefslogtreecommitdiffstats
path: root/apps/action.c
diff options
context:
space:
mode:
authorJonathan Gordon <rockbox@jdgordon.info>2012-01-12 22:28:36 +1100
committerJonathan Gordon <rockbox@jdgordon.info>2012-01-12 22:28:36 +1100
commiteb2ea7f9ad4c4e2cce390f8fe73e17698fa9a906 (patch)
tree64cd1f227d75a5758b52d9b49ae7bdf23f6dbf83 /apps/action.c
parent5ef27368f1bcbe31fb27072983d7a29df8de6845 (diff)
downloadrockbox-eb2ea7f9ad4c4e2cce390f8fe73e17698fa9a906.tar.gz
rockbox-eb2ea7f9ad4c4e2cce390f8fe73e17698fa9a906.tar.bz2
rockbox-eb2ea7f9ad4c4e2cce390f8fe73e17698fa9a906.zip
keyclick: Add a callback so screens can cancel a click. Add a generic list callback to stop clicks when we are at the end of the list
Change-Id: Iabb44a861dd7506cd883c1bdb0241303fa646746
Diffstat (limited to 'apps/action.c')
-rw-r--r--apps/action.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/apps/action.c b/apps/action.c
index e192daae4e..44980cdd9e 100644
--- a/apps/action.c
+++ b/apps/action.c
@@ -246,12 +246,6 @@ static int get_action_worker(int context, int timeout,
return ACTION_NONE;
}
-
-#if CONFIG_CODEC == SWCODEC
- /* Produce keyclick */
- keyclick_click(button);
-#endif
-
if ((context != last_context) && ((last_button & BUTTON_REL) == 0)
#ifdef HAVE_SCROLLWHEEL
/* Scrollwheel doesn't generate release events */
@@ -371,6 +365,12 @@ static int get_action_worker(int context, int timeout,
last_action = ret;
last_data = button_get_data();
last_action_tick = current_tick;
+
+#if CONFIG_CODEC == SWCODEC
+ /* Produce keyclick */
+ keyclick_click(ret);
+#endif
+
return ret;
}