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.tar.gz rockbox-49f1ec8e8ad0b4c06df01fcdd4b18037fbe3ebcc.zip |
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 8f427c8d68..d61930a08c 100644 --- a/apps/action.c +++ b/apps/action.c | |||
@@ -183,8 +183,9 @@ static int get_action_worker(int context, int timeout, | |||
183 | else | 183 | else |
184 | button = button_get_w_tmo(timeout); | 184 | button = button_get_w_tmo(timeout); |
185 | 185 | ||
186 | /* Data from sys events can be pulled with button_get_data */ | 186 | /* Data from sys events can be pulled with button_get_data |
187 | if (button == BUTTON_NONE || button & SYS_EVENT) | 187 | * multimedia button presses don't go through the action system */ |
188 | if (button == BUTTON_NONE || button & (SYS_EVENT|BUTTON_MULTIMEDIA)) | ||
188 | return button; | 189 | return button; |
189 | /* Don't send any buttons through untill we see the release event */ | 190 | /* Don't send any buttons through untill we see the release event */ |
190 | if (wait_for_release) | 191 | if (wait_for_release) |