diff options
| author | Thomas Martitz <kugel@rockbox.org> | 2010-10-31 15:32:57 +0000 |
|---|---|---|
| committer | Thomas Martitz <kugel@rockbox.org> | 2010-10-31 15:32:57 +0000 |
| commit | 49f1ec8e8ad0b4c06df01fcdd4b18037fbe3ebcc (patch) | |
| tree | b185e604dcea64865389f5b149e754ba8ffd3f75 /apps/action.c | |
| parent | dbe2ac1ec6f4ed88f267d2a4df024b6dc42a87ff (diff) | |
| download | rockbox-49f1ec8e8ad0b4c06df01fcdd4b18037fbe3ebcc.zip rockbox-49f1ec8e8ad0b4c06df01fcdd4b18037fbe3ebcc.tar.gz rockbox-49f1ec8e8ad0b4c06df01fcdd4b18037fbe3ebcc.tar.bz2 rockbox-49f1ec8e8ad0b4c06df01fcdd4b18037fbe3ebcc.tar.xz | |
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
Diffstat (limited to 'apps/action.c')
| -rw-r--r-- | apps/action.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/apps/action.c b/apps/action.c index 8f427c8..d61930a 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) |