summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens Arnold <amiconn@rockbox.org>2009-06-20 09:27:17 +0000
committerJens Arnold <amiconn@rockbox.org>2009-06-20 09:27:17 +0000
commit346da2fd5e7d9e0f7b27934d84b5fef848f360af (patch)
tree585a8acc4719ec4347c42c94e5c4448be4906952
parente82be6ead8a81650b48b7ababd5a61b36bf41fcd (diff)
downloadrockbox-346da2fd5e7d9e0f7b27934d84b5fef848f360af.tar.gz
rockbox-346da2fd5e7d9e0f7b27934d84b5fef848f360af.zip
Fix a few HID contexts to use proper preconditons (no more pause-before-stop and stop event flooding).
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21366 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/keymaps/keymap-c200.c4
-rw-r--r--apps/keymaps/keymap-h10.c4
-rw-r--r--apps/keymaps/keymap-ipod.c4
3 files changed, 6 insertions, 6 deletions
diff --git a/apps/keymaps/keymap-c200.c b/apps/keymaps/keymap-c200.c
index c9e5d4394e..b6047611ef 100644
--- a/apps/keymaps/keymap-c200.c
+++ b/apps/keymaps/keymap-c200.c
@@ -281,8 +281,8 @@ static const struct button_mapping button_context_bmark[] = {
281 281
282#ifdef HAVE_USBSTACK 282#ifdef HAVE_USBSTACK
283static const struct button_mapping button_context_usb_hid[] = { 283static const struct button_mapping button_context_usb_hid[] = {
284 { ACTION_USB_HID_PLAY, BUTTON_UP, BUTTON_NONE }, 284 { ACTION_USB_HID_PLAY, BUTTON_UP|BUTTON_REL, BUTTON_UP },
285 { ACTION_USB_HID_STOP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, 285 { ACTION_USB_HID_STOP, BUTTON_UP|BUTTON_REPEAT, BUTTON_UP },
286 { ACTION_USB_HID_SKIPPREV, BUTTON_LEFT, BUTTON_NONE }, 286 { ACTION_USB_HID_SKIPPREV, BUTTON_LEFT, BUTTON_NONE },
287 { ACTION_USB_HID_SKIPNEXT, BUTTON_RIGHT, BUTTON_NONE }, 287 { ACTION_USB_HID_SKIPNEXT, BUTTON_RIGHT, BUTTON_NONE },
288 { ACTION_USB_HID_VOLUP, BUTTON_VOL_UP, BUTTON_NONE }, 288 { ACTION_USB_HID_VOLUP, BUTTON_VOL_UP, BUTTON_NONE },
diff --git a/apps/keymaps/keymap-h10.c b/apps/keymaps/keymap-h10.c
index 0c1d4b2331..ff6c66d629 100644
--- a/apps/keymaps/keymap-h10.c
+++ b/apps/keymaps/keymap-h10.c
@@ -338,8 +338,8 @@ static const struct button_mapping button_context_radio[] = {
338 338
339#ifdef HAVE_USBSTACK 339#ifdef HAVE_USBSTACK
340static const struct button_mapping button_context_usb_hid[] = { 340static const struct button_mapping button_context_usb_hid[] = {
341 { ACTION_USB_HID_PLAY, BUTTON_PLAY, BUTTON_NONE }, 341 { ACTION_USB_HID_PLAY, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY },
342 { ACTION_USB_HID_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE }, 342 { ACTION_USB_HID_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY },
343 { ACTION_USB_HID_SKIPPREV, BUTTON_REW, BUTTON_NONE }, 343 { ACTION_USB_HID_SKIPPREV, BUTTON_REW, BUTTON_NONE },
344 { ACTION_USB_HID_SKIPNEXT, BUTTON_FF, BUTTON_NONE }, 344 { ACTION_USB_HID_SKIPNEXT, BUTTON_FF, BUTTON_NONE },
345 { ACTION_USB_HID_VOLUP, BUTTON_SCROLL_UP, BUTTON_NONE }, 345 { ACTION_USB_HID_VOLUP, BUTTON_SCROLL_UP, BUTTON_NONE },
diff --git a/apps/keymaps/keymap-ipod.c b/apps/keymaps/keymap-ipod.c
index 8170e8c7e1..02c562eb45 100644
--- a/apps/keymaps/keymap-ipod.c
+++ b/apps/keymaps/keymap-ipod.c
@@ -192,8 +192,8 @@ const struct button_mapping button_context_recscreen[] = {
192 192
193#ifdef HAVE_USBSTACK 193#ifdef HAVE_USBSTACK
194static const struct button_mapping button_context_usb_hid[] = { 194static const struct button_mapping button_context_usb_hid[] = {
195 { ACTION_USB_HID_PLAY, BUTTON_PLAY, BUTTON_NONE }, 195 { ACTION_USB_HID_PLAY, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY },
196 { ACTION_USB_HID_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE }, 196 { ACTION_USB_HID_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY },
197 { ACTION_USB_HID_SKIPPREV, BUTTON_LEFT, BUTTON_NONE }, 197 { ACTION_USB_HID_SKIPPREV, BUTTON_LEFT, BUTTON_NONE },
198 { ACTION_USB_HID_SKIPNEXT, BUTTON_RIGHT, BUTTON_NONE }, 198 { ACTION_USB_HID_SKIPNEXT, BUTTON_RIGHT, BUTTON_NONE },
199 { ACTION_USB_HID_VOLUP, BUTTON_SCROLL_FWD, BUTTON_NONE }, 199 { ACTION_USB_HID_VOLUP, BUTTON_SCROLL_FWD, BUTTON_NONE },