From 49f1ec8e8ad0b4c06df01fcdd4b18037fbe3ebcc Mon Sep 17 00:00:00 2001 From: Thomas Martitz Date: Sun, 31 Oct 2010 15:32:57 +0000 Subject: Add support multimedia keys/buttons to the core, and adapt Rockbox on android for it (multimedia buttons are found on wired headsets and the lock screen in cyanogenmod). git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28421 a1c6a512-1295-4272-9138-f99709370657 --- apps/action.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'apps/action.c') diff --git a/apps/action.c b/apps/action.c index 8f427c8d68..d61930a08c 100644 --- a/apps/action.c +++ b/apps/action.c @@ -183,8 +183,9 @@ static int get_action_worker(int context, int timeout, else button = button_get_w_tmo(timeout); - /* Data from sys events can be pulled with button_get_data */ - if (button == BUTTON_NONE || button & SYS_EVENT) + /* Data from sys events can be pulled with button_get_data + * multimedia button presses don't go through the action system */ + if (button == BUTTON_NONE || button & (SYS_EVENT|BUTTON_MULTIMEDIA)) return button; /* Don't send any buttons through untill we see the release event */ if (wait_for_release) -- cgit v1.2.3