diff options
author | Frank Gevaerts <frank@gevaerts.be> | 2009-05-23 15:48:11 +0000 |
---|---|---|
committer | Frank Gevaerts <frank@gevaerts.be> | 2009-05-23 15:48:11 +0000 |
commit | 35d9323889f623a9183da78028306ae6a2eb58c6 (patch) | |
tree | 16c1f35b40b7c1929d390a7972f65f6729a9abbc /apps | |
parent | 7a8c615de3444e6341ccbdf9f6ef545802707184 (diff) | |
download | rockbox-35d9323889f623a9183da78028306ae6a2eb58c6.tar.gz rockbox-35d9323889f623a9183da78028306ae6a2eb58c6.zip |
fix some keymaps to actually compile (FS#10237, by Tomer Shalev)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21059 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r-- | apps/keymaps/keymap-gigabeat-s.c | 2 | ||||
-rw-r--r-- | apps/keymaps/keymap-h10.c | 34 |
2 files changed, 5 insertions, 31 deletions
diff --git a/apps/keymaps/keymap-gigabeat-s.c b/apps/keymaps/keymap-gigabeat-s.c index 4fc7e8d469..66b58615c5 100644 --- a/apps/keymaps/keymap-gigabeat-s.c +++ b/apps/keymaps/keymap-gigabeat-s.c @@ -486,7 +486,7 @@ static const struct button_mapping button_context_usb_hid[] = { static const struct button_mapping remote_button_context_usb_hid[] = { { ACTION_USB_HID_PLAY, BUTTON_RC_PLAY, BUTTON_NONE }, - { ACTION_USB_HID_STOP, BUTTON_RC_POWER, BUTTON_NONE }, + { ACTION_USB_HID_STOP, BUTTON_RC_PLAY|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_USB_HID_SKIPPREV, BUTTON_RC_REW, BUTTON_NONE }, { ACTION_USB_HID_SKIPNEXT, BUTTON_RC_FF, BUTTON_NONE }, { ACTION_USB_HID_VOLUP, BUTTON_RC_VOL_UP, BUTTON_NONE }, diff --git a/apps/keymaps/keymap-h10.c b/apps/keymaps/keymap-h10.c index 77247d35d8..aed55dbfa2 100644 --- a/apps/keymaps/keymap-h10.c +++ b/apps/keymaps/keymap-h10.c @@ -332,32 +332,6 @@ static const struct button_mapping button_context_radio[] = { }; - - - - - -static const struct button_mapping remote_button_context_wps[] = { - { ACTION_WPS_PLAY, BUTTON_RC_PLAY|BUTTON_REL, BUTTON_RC_PLAY }, - { ACTION_WPS_STOP, BUTTON_RC_PLAY|BUTTON_REPEAT,BUTTON_RC_PLAY }, - { ACTION_WPS_SKIPPREV, BUTTON_RC_REW|BUTTON_REL, BUTTON_RC_REW}, - { ACTION_WPS_SEEKBACK, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_WPS_STOPSEEK, BUTTON_RC_REW|BUTTON_REL, BUTTON_RC_REW|BUTTON_REPEAT }, - { ACTION_WPS_SKIPNEXT, BUTTON_RC_FF|BUTTON_REL, BUTTON_RC_FF }, - { ACTION_WPS_SEEKFWD, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_WPS_STOPSEEK, BUTTON_RC_FF|BUTTON_REL, BUTTON_RC_FF|BUTTON_REPEAT }, - - { ACTION_WPS_VOLDOWN, BUTTON_RC_VOL_DOWN, BUTTON_NONE }, - { ACTION_WPS_VOLDOWN, BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_WPS_VOLUP, BUTTON_RC_VOL_UP, BUTTON_NONE }, - { ACTION_WPS_VOLUP, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, - - { ACTION_WPS_PITCHSCREEN, BUTTON_RC_PLAY|BUTTON_LEFT, BUTTON_RC_PLAY }, - { ACTION_WPS_ID3SCREEN, BUTTON_RC_PLAY|BUTTON_RIGHT, BUTTON_RC_PLAY }, - - LAST_ITEM_IN_LIST -}; /* remote_button_context_wps */ - #ifdef HAVE_USBSTACK static const struct button_mapping button_context_usb_hid[] = { { ACTION_USB_HID_PLAY, BUTTON_PLAY, BUTTON_NONE }, @@ -378,10 +352,10 @@ static const struct button_mapping remote_button_context_usb_hid[] = { { ACTION_USB_HID_STOP, BUTTON_RC_PLAY|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_USB_HID_SKIPPREV, BUTTON_RC_REW, BUTTON_NONE }, { ACTION_USB_HID_SKIPNEXT, BUTTON_RC_FF, BUTTON_NONE }, - { ACTION_USB_HID_VOLUP, BUTTON_RC_SCROLL_UP, BUTTON_NONE }, - { ACTION_USB_HID_VOLUP, BUTTON_RC_SCROLL_UP|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_USB_HID_VOLDOWN, BUTTON_RC_SCROLL_DOWN, BUTTON_NONE }, - { ACTION_USB_HID_VOLDOWN, BUTTON_RC_SCROLL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_USB_HID_VOLUP, BUTTON_RC_VOL_UP, BUTTON_NONE }, + { ACTION_USB_HID_VOLUP, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_USB_HID_VOLDOWN, BUTTON_RC_VOL_DOWN, BUTTON_NONE }, + { ACTION_USB_HID_VOLDOWN, BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, LAST_ITEM_IN_LIST }; /* remote_button_context_usb_hid */ |