3 files changed, 45 insertions, 12 deletions

diff --git a/firmware/target/hosted/button-devinput.c b/firmware/target/hosted/button-devinput.c
index 90e6fb0340..b1b4dfca5d 100644
--- a/firmware/target/hosted/button-devinput.c
+++ b/firmware/target/hosted/button-devinput.c
@@ -19,7 +19,6 @@
  * KIND, either express or implied.
  *
  ****************************************************************************/
-
 #include <poll.h>
 #include <errno.h>
 #include <unistd.h>
@@ -72,6 +71,11 @@ void button_close_device(void)
     num_devices = 0;
 }
 
+#ifdef BUTTON_DELAY_RELEASE
+static int button_delay_release = 0;
+static int delay_tick = 0;
+#endif
+
 int button_read_device(void)
 {
     static int button_bitmap = 0;
@@ -81,6 +85,15 @@ int button_read_device(void)
     int wheel_ticks = 0;
 #endif
 
+#ifdef BUTTON_DELAY_RELEASE
+    /* First de-assert delayed-release buttons */
+    if (button_delay_release && current_tick >= delay_tick)
+    {
+        button_bitmap &= ~button_delay_release;
+        button_delay_release = 0;
+    }
+#endif
+
     /* check if there are any events pending and process them */
     while(poll(poll_fds, num_devices, 0))
     {
@@ -92,17 +105,14 @@ int button_read_device(void)
                 int size = read(poll_fds[i].fd, &event, sizeof(event));
                 if(size == (int)sizeof(event))
                 {
-                    int keycode = event.code;
+                    /* map linux event code to rockbox button bitmap */
+                    int bmap = button_map(event.code);
+
                     /* event.value == 0x10000 means press
                      * event.value == 0 means release
                      */
-                    bool press = event.value ? true : false;
-
-                    /* map linux event code to rockbox button bitmap */
-                    if(press)
+                    if(event.value)
                     {
-                        int bmap = button_map(keycode);
-
 #ifdef HAVE_SCROLLWHEEL
                         /* Filter out wheel ticks */
                         if (bmap & BUTTON_SCROLL_BACK)
@@ -111,18 +121,28 @@ int button_read_device(void)
                             wheel_ticks++;
                         bmap &= ~(BUTTON_SCROLL_BACK|BUTTON_SCROLL_FWD);
 #endif
+#ifdef BUTTON_DELAY_RELEASE
+                        bmap &= ~BUTTON_DELAY_RELEASE;
+#endif
                         button_bitmap |= bmap;
                     }
                     else
                     {
-                        int bmap = button_map(keycode);
+#ifdef BUTTON_DELAY_RELEASE
+                        /* Delay the release of any requested buttons */
+                        if (bmap & BUTTON_DELAY_RELEASE)
+                        {
+                            button_delay_release |= bmap & ~BUTTON_DELAY_RELEASE;
+                            delay_tick = current_tick + HZ/20;
+                            bmap = 0;
+                        }
+#endif
 
 #ifdef HAVE_SCROLLWHEEL
                         /* Wheel gives us press+release back to back; ignore the release */
                         bmap &= ~(BUTTON_SCROLL_BACK|BUTTON_SCROLL_FWD);
 #endif
                         button_bitmap &= ~bmap;
-
                     }
                 }
             }
diff --git a/firmware/target/hosted/xduoo/button-target.h b/firmware/target/hosted/xduoo/button-target.h
index 20bae1c6f6..d1a2b27624 100644
--- a/firmware/target/hosted/xduoo/button-target.h
+++ b/firmware/target/hosted/xduoo/button-target.h
@@ -36,6 +36,8 @@
 #define BUTTON_MAIN  (BUTTON_POWER | BUTTON_HOME | BUTTON_OPTION | BUTTON_PREV | \
                       BUTTON_NEXT | BUTTON_PLAY | BUTTON_VOL_UP | BUTTON_VOL_DOWN)
 
+#define BUTTON_DELAY_RELEASE 0x00010000
+
 /* Software power-off */
 #define POWEROFF_BUTTON BUTTON_POWER
 #define POWEROFF_COUNT  25
diff --git a/firmware/target/hosted/xduoo/button-xduoo.c b/firmware/target/hosted/xduoo/button-xduoo.c
index f5b6c6be62..2daa7da16b 100644
--- a/firmware/target/hosted/xduoo/button-xduoo.c
+++ b/firmware/target/hosted/xduoo/button-xduoo.c
@@ -37,10 +37,10 @@ int button_map(int keycode)
             return BUTTON_OPTION;
 
         case KEY_UP:
-            return BUTTON_PREV;
+            return BUTTON_NEXT;
 
         case KEY_DOWN:
-            return BUTTON_NEXT;
+            return BUTTON_PREV;
 
         case KEY_ENTER:
             return BUTTON_PLAY;
@@ -54,6 +54,17 @@ int button_map(int keycode)
         case KEY_POWER:
             return BUTTON_POWER;
 
+#if defined(XDUOO_X3II) /* Headphone remote */
+        case KEY_NEXTSONG:
+            return (BUTTON_NEXT | BUTTON_DELAY_RELEASE);
+
+        case KEY_PLAYPAUSE:
+            return (BUTTON_PLAY | BUTTON_DELAY_RELEASE);
+
+        case KEY_PREVIOUSSONG:
+            return (BUTTON_PREV | BUTTON_DELAY_RELEASE);
+
+#endif
         default:
             return 0;
     }