diff options
author | Rob Purchase <shotofadds@rockbox.org> | 2008-09-16 08:09:44 +0000 |
---|---|---|
committer | Rob Purchase <shotofadds@rockbox.org> | 2008-09-16 08:09:44 +0000 |
commit | 1a08f46329e9f6d7bd55a8a9ad45db27df8a7593 (patch) | |
tree | 693d2bd43f42c2d1ba35584e3a0b08f4fcef5969 /apps | |
parent | 9cf7ef68c9747fe1baa16a80e28d8cb783ea63f5 (diff) | |
download | rockbox-1a08f46329e9f6d7bd55a8a9ad45db27df8a7593.tar.gz rockbox-1a08f46329e9f6d7bd55a8a9ad45db27df8a7593.zip |
Commit fs#9404 (iAudio 7 updates by vitja). Also fixes play/pause behaviour on D2.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18528 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r-- | apps/keymaps/keymap-iaudio67.c | 12 | ||||
-rw-r--r-- | apps/plugins/doom/i_video.c | 9 |
2 files changed, 16 insertions, 5 deletions
diff --git a/apps/keymaps/keymap-iaudio67.c b/apps/keymaps/keymap-iaudio67.c index b97a5602c9..b0dac93386 100644 --- a/apps/keymaps/keymap-iaudio67.c +++ b/apps/keymaps/keymap-iaudio67.c | |||
@@ -40,11 +40,12 @@ static const struct button_mapping button_context_standard[] = { | |||
40 | { ACTION_STD_NEXT, BUTTON_LEFT, BUTTON_NONE }, | 40 | { ACTION_STD_NEXT, BUTTON_LEFT, BUTTON_NONE }, |
41 | { ACTION_STD_NEXTREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | 41 | { ACTION_STD_NEXTREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, |
42 | 42 | ||
43 | { ACTION_STD_OK, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, | 43 | { ACTION_STD_OK, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, |
44 | { ACTION_STD_OK, BUTTON_PLAY, BUTTON_NONE }, | 44 | { ACTION_STD_OK, BUTTON_PLAY, BUTTON_NONE }, |
45 | { ACTION_STD_CANCEL, BUTTON_STOP, BUTTON_NONE }, | 45 | { ACTION_STD_CANCEL, BUTTON_STOP, BUTTON_NONE }, |
46 | { ACTION_STD_CANCEL, BUTTON_POWER, BUTTON_NONE }, | ||
46 | 47 | ||
47 | { ACTION_STD_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, | 48 | { ACTION_STD_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, |
48 | { ACTION_STD_CONTEXT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, | 49 | { ACTION_STD_CONTEXT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, |
49 | // { ACTION_STD_QUICKSCREEN, BUTTON_REC|BUTTON_PLAY, BUTTON_NONE }, | 50 | // { ACTION_STD_QUICKSCREEN, BUTTON_REC|BUTTON_PLAY, BUTTON_NONE }, |
50 | 51 | ||
@@ -69,7 +70,8 @@ static const struct button_mapping button_context_wps[] = { | |||
69 | { ACTION_WPS_SEEKFWD, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | 70 | { ACTION_WPS_SEEKFWD, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, |
70 | { ACTION_WPS_STOPSEEK, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT|BUTTON_REPEAT }, | 71 | { ACTION_WPS_STOPSEEK, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT|BUTTON_REPEAT }, |
71 | 72 | ||
72 | { ACTION_WPS_STOP, BUTTON_STOP, BUTTON_NONE }, | 73 | { ACTION_WPS_PLAY, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, |
74 | { ACTION_WPS_STOP, BUTTON_STOP, BUTTON_NONE }, | ||
73 | 75 | ||
74 | LAST_ITEM_IN_LIST | 76 | LAST_ITEM_IN_LIST |
75 | }; /* button_context_wps */ | 77 | }; /* button_context_wps */ |
diff --git a/apps/plugins/doom/i_video.c b/apps/plugins/doom/i_video.c index f0aacc47ec..15d0166733 100644 --- a/apps/plugins/doom/i_video.c +++ b/apps/plugins/doom/i_video.c | |||
@@ -268,6 +268,15 @@ void I_ShutdownGraphics(void) | |||
268 | #define DOOMBUTTON_ESC BUTTON_POWER | 268 | #define DOOMBUTTON_ESC BUTTON_POWER |
269 | #define DOOMBUTTON_ENTER BUTTON_MENU | 269 | #define DOOMBUTTON_ENTER BUTTON_MENU |
270 | #define DOOMBUTTON_WEAPON BUTTON_DISPLAY | 270 | #define DOOMBUTTON_WEAPON BUTTON_DISPLAY |
271 | #elif CONFIG_KEYPAD == IAUDIO67_PAD | ||
272 | #define DOOMBUTTON_ESC BUTTON_POWER | ||
273 | #define DOOMBUTTON_UP BUTTON_STOP | ||
274 | #define DOOMBUTTON_DOWN BUTTON_PLAY | ||
275 | #define DOOMBUTTON_LEFT BUTTON_LEFT | ||
276 | #define DOOMBUTTON_RIGHT BUTTON_RIGHT | ||
277 | #define DOOMBUTTON_SHOOT BUTTON_VOLUP | ||
278 | #define DOOMBUTTON_OPEN BUTTON_VOLDOWN | ||
279 | #define DOOMBUTTON_ENTER BUTTON_MENU | ||
271 | #else | 280 | #else |
272 | #error Keymap not defined! | 281 | #error Keymap not defined! |
273 | #endif | 282 | #endif |