From e299f01134cc22ac156d9fd7c457e0d78f12f047 Mon Sep 17 00:00:00 2001
From: Jonas Karlman <jonas@kwiboo.se>
Date: Sun, 12 Feb 2017 17:56:16 +0100
Subject: [PATCH 1/2] v4l-utils: add 70-input-repeat.rules

This moves the repeat delay config from 98-eventlircd.rules,
changes the repeat period from 33ms to 80ms for lircd-uinput
and changes the repeat delay from 1s to 500ms for all input devices.
---
 .../eventlircd/udev.d/98-eventlircd.rules      |  3 ---
 .../v4l-utils/udev.d/70-input-repeat.rules     | 18 ++++++++++++++++++
 2 files changed, 18 insertions(+), 3 deletions(-)
 create mode 100644 packages/sysutils/v4l-utils/udev.d/70-input-repeat.rules

diff --git a/packages/sysutils/eventlircd/udev.d/98-eventlircd.rules b/packages/sysutils/eventlircd/udev.d/98-eventlircd.rules
index 730640d45f..4a47a62514 100644
--- a/packages/sysutils/eventlircd/udev.d/98-eventlircd.rules
+++ b/packages/sysutils/eventlircd/udev.d/98-eventlircd.rules
@@ -194,9 +194,6 @@ ENV{eventlircd_evmap}="osmc_rf.evmap"
 
 LABEL="end-usb"
 
-# Set default delays (1000ms for first repeat, to avoid multiple keypresses).
-  RUN+="/usr/bin/ir-keytable --delay=1000 --device=$devnode"
-
 #-------------------------------------------------------------------------------
 # Ask eventlircd to handle Bluetooth HID devices that show up as event devices
 # and are known to be remote controls. For simplicity, the event map file names
diff --git a/packages/sysutils/v4l-utils/udev.d/70-input-repeat.rules b/packages/sysutils/v4l-utils/udev.d/70-input-repeat.rules
new file mode 100644
index 0000000000..541276b87d
--- /dev/null
+++ b/packages/sysutils/v4l-utils/udev.d/70-input-repeat.rules
@@ -0,0 +1,18 @@
+ACTION=="add", SUBSYSTEM=="input", KERNEL=="event[0-9]*", GOTO="start"
+GOTO="end"
+LABEL="start"
+
+# don't change eventlircd device settings
+ATTRS{name}=="eventlircd", GOTO="end"
+
+# don't change settings of rc remotes
+SUBSYSTEMS=="rc", GOTO="end"
+
+# set default repeat delay to 500ms like rc remotes
+RUN+="/usr/bin/ir-keytable --delay=500 --device=$devnode"
+
+# make lircd-uinput use same repeat period like keyboards in kodi
+ATTRS{name}=="lircd-uinput", \
+  RUN+="/usr/bin/ir-keytable --period=80 --device=$devnode"
+
+LABEL="end"

From 7ecd677bee57b39bb1b610ef2e293561f7a08272 Mon Sep 17 00:00:00 2001
From: Jonas Karlman <jonas@kwiboo.se>
Date: Sun, 12 Feb 2017 17:56:16 +0100
Subject: [PATCH 2/2] kodi: process more lirc repeat events

---
 .../kodi/config/advancedsettings.xml          |  1 +
 .../kodi/patches/kodi-999.99-PR11662.patch    | 22 +++++++++++++++++++
 projects/RPi/kodi/advancedsettings.xml        |  1 +
 projects/RPi2/kodi/advancedsettings.xml       |  1 +
 projects/WeTek_Core/kodi/advancedsettings.xml |  1 +
 projects/WeTek_Hub/kodi/advancedsettings.xml  |  1 +
 projects/WeTek_Play/kodi/advancedsettings.xml |  1 +
 .../WeTek_Play_2/kodi/advancedsettings.xml    |  1 +
 projects/imx6/kodi/advancedsettings.xml       |  1 +
 9 files changed, 30 insertions(+)
 create mode 100644 packages/mediacenter/kodi/patches/kodi-999.99-PR11662.patch

diff --git a/packages/mediacenter/kodi/config/advancedsettings.xml b/packages/mediacenter/kodi/config/advancedsettings.xml
index 0b5968f9b3..ea5d611759 100644
--- a/packages/mediacenter/kodi/config/advancedsettings.xml
+++ b/packages/mediacenter/kodi/config/advancedsettings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <advancedsettings>
   <showexitbutton>false</showexitbutton>
+  <remotedelay>1</remotedelay>
   <cputempcommand>cputemp</cputempcommand>
   <gputempcommand>gputemp</gputempcommand>
   <video>
diff --git a/packages/mediacenter/kodi/patches/kodi-999.99-PR11662.patch b/packages/mediacenter/kodi/patches/kodi-999.99-PR11662.patch
new file mode 100644
index 0000000000..e9fdb7190b
--- /dev/null
+++ b/packages/mediacenter/kodi/patches/kodi-999.99-PR11662.patch
@@ -0,0 +1,22 @@
+From f907adcd658a00031f88f1c0de817672cb51b57c Mon Sep 17 00:00:00 2001
+From: Jonas Karlman <jonas@kwiboo.se>
+Date: Sun, 12 Feb 2017 16:31:29 +0100
+Subject: [PATCH] [settings] change allowed remotedelay range to inlcude zero
+
+---
+ xbmc/settings/AdvancedSettings.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/xbmc/settings/AdvancedSettings.cpp b/xbmc/settings/AdvancedSettings.cpp
+index 1c87d8c..b817f94 100644
+--- a/xbmc/settings/AdvancedSettings.cpp
++++ b/xbmc/settings/AdvancedSettings.cpp
+@@ -1011,7 +1011,7 @@ void CAdvancedSettings::ParseSettingsFile(const std::string &file)
+     }
+   }
+ 
+-  XMLUtils::GetInt(pRootElement, "remotedelay", m_remoteDelay, 1, 20);
++  XMLUtils::GetInt(pRootElement, "remotedelay", m_remoteDelay, 0, 20);
+   XMLUtils::GetFloat(pRootElement, "controllerdeadzone", m_controllerDeadzone, 0.0f, 1.0f);
+   XMLUtils::GetUInt(pRootElement, "fanartres", m_fanartRes, 0, 1080);
+   XMLUtils::GetUInt(pRootElement, "imageres", m_imageRes, 0, 1080);
diff --git a/projects/RPi/kodi/advancedsettings.xml b/projects/RPi/kodi/advancedsettings.xml
index ad35244823..00ed0dda87 100644
--- a/projects/RPi/kodi/advancedsettings.xml
+++ b/projects/RPi/kodi/advancedsettings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <advancedsettings>
   <showexitbutton>false</showexitbutton>
+  <remotedelay>1</remotedelay>
 
   <fanartres>720</fanartres>
   <imageres>540</imageres>
diff --git a/projects/RPi2/kodi/advancedsettings.xml b/projects/RPi2/kodi/advancedsettings.xml
index ad35244823..00ed0dda87 100644
--- a/projects/RPi2/kodi/advancedsettings.xml
+++ b/projects/RPi2/kodi/advancedsettings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <advancedsettings>
   <showexitbutton>false</showexitbutton>
+  <remotedelay>1</remotedelay>
 
   <fanartres>720</fanartres>
   <imageres>540</imageres>
diff --git a/projects/WeTek_Core/kodi/advancedsettings.xml b/projects/WeTek_Core/kodi/advancedsettings.xml
index bcca951759..cd65434ad5 100644
--- a/projects/WeTek_Core/kodi/advancedsettings.xml
+++ b/projects/WeTek_Core/kodi/advancedsettings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <advancedsettings>
   <showexitbutton>false</showexitbutton>
+  <remotedelay>1</remotedelay>
 
   <samba>
     <clienttimeout>30</clienttimeout>
diff --git a/projects/WeTek_Hub/kodi/advancedsettings.xml b/projects/WeTek_Hub/kodi/advancedsettings.xml
index bcca951759..cd65434ad5 100644
--- a/projects/WeTek_Hub/kodi/advancedsettings.xml
+++ b/projects/WeTek_Hub/kodi/advancedsettings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <advancedsettings>
   <showexitbutton>false</showexitbutton>
+  <remotedelay>1</remotedelay>
 
   <samba>
     <clienttimeout>30</clienttimeout>
diff --git a/projects/WeTek_Play/kodi/advancedsettings.xml b/projects/WeTek_Play/kodi/advancedsettings.xml
index bcca951759..cd65434ad5 100644
--- a/projects/WeTek_Play/kodi/advancedsettings.xml
+++ b/projects/WeTek_Play/kodi/advancedsettings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <advancedsettings>
   <showexitbutton>false</showexitbutton>
+  <remotedelay>1</remotedelay>
 
   <samba>
     <clienttimeout>30</clienttimeout>
diff --git a/projects/WeTek_Play_2/kodi/advancedsettings.xml b/projects/WeTek_Play_2/kodi/advancedsettings.xml
index bcca951759..cd65434ad5 100644
--- a/projects/WeTek_Play_2/kodi/advancedsettings.xml
+++ b/projects/WeTek_Play_2/kodi/advancedsettings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <advancedsettings>
   <showexitbutton>false</showexitbutton>
+  <remotedelay>1</remotedelay>
 
   <samba>
     <clienttimeout>30</clienttimeout>
diff --git a/projects/imx6/kodi/advancedsettings.xml b/projects/imx6/kodi/advancedsettings.xml
index e190999385..2ef3dccb44 100644
--- a/projects/imx6/kodi/advancedsettings.xml
+++ b/projects/imx6/kodi/advancedsettings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <advancedsettings>
   <showexitbutton>false</showexitbutton>
+  <remotedelay>1</remotedelay>
   <samba>
     <clienttimeout>30</clienttimeout>
   </samba>