From 600b0b572b4dc2d48e3b50e5d0d22db4ba68a7ee Mon Sep 17 00:00:00 2001
From: MilhouseVH <milhouseVH.github@nmacleod.com>
Date: Thu, 5 May 2016 15:29:49 +0100
Subject: [PATCH 1/3] kodi: Drop obsolete (and default) read[buffer]factor
 setting after PR9681

---
 packages/mediacenter/kodi/config/advancedsettings.xml | 3 ---
 projects/RPi/kodi/advancedsettings.xml                | 5 -----
 projects/RPi2/kodi/advancedsettings.xml               | 5 -----
 projects/WeTek_Core/kodi/advancedsettings.xml         | 4 ----
 projects/WeTek_Play/kodi/advancedsettings.xml         | 4 ----
 projects/imx6/kodi/advancedsettings.xml               | 5 -----
 6 files changed, 26 deletions(-)

diff --git a/packages/mediacenter/kodi/config/advancedsettings.xml b/packages/mediacenter/kodi/config/advancedsettings.xml
index c54111aaa3..e139c4836e 100644
--- a/packages/mediacenter/kodi/config/advancedsettings.xml
+++ b/packages/mediacenter/kodi/config/advancedsettings.xml
@@ -17,7 +17,4 @@
   <samba>
     <clienttimeout>30</clienttimeout>
   </samba>
-  <network>
-    <readbufferfactor>4.0</readbufferfactor>
-  </network>
 </advancedsettings>
diff --git a/projects/RPi/kodi/advancedsettings.xml b/projects/RPi/kodi/advancedsettings.xml
index e1a7c0dc9b..45b34cb598 100644
--- a/projects/RPi/kodi/advancedsettings.xml
+++ b/projects/RPi/kodi/advancedsettings.xml
@@ -12,9 +12,4 @@
   <samba>
     <clienttimeout>30</clienttimeout>
   </samba>
-
-  <network>
-    <readbufferfactor>4.0</readbufferfactor>
-  </network>
-
 </advancedsettings>
diff --git a/projects/RPi2/kodi/advancedsettings.xml b/projects/RPi2/kodi/advancedsettings.xml
index e1a7c0dc9b..45b34cb598 100644
--- a/projects/RPi2/kodi/advancedsettings.xml
+++ b/projects/RPi2/kodi/advancedsettings.xml
@@ -12,9 +12,4 @@
   <samba>
     <clienttimeout>30</clienttimeout>
   </samba>
-
-  <network>
-    <readbufferfactor>4.0</readbufferfactor>
-  </network>
-
 </advancedsettings>
diff --git a/projects/WeTek_Core/kodi/advancedsettings.xml b/projects/WeTek_Core/kodi/advancedsettings.xml
index 6c59e0b8a7..ecb3edfae5 100644
--- a/projects/WeTek_Core/kodi/advancedsettings.xml
+++ b/projects/WeTek_Core/kodi/advancedsettings.xml
@@ -6,10 +6,6 @@
     <clienttimeout>30</clienttimeout>
   </samba>
 
-  <network>
-    <readbufferfactor>4.0</readbufferfactor>
-  </network>
-
   <pvr>
     <minvideocachelevel>5</minvideocachelevel>
     <minaudiocachelevel>20</minaudiocachelevel>
diff --git a/projects/WeTek_Play/kodi/advancedsettings.xml b/projects/WeTek_Play/kodi/advancedsettings.xml
index 6c59e0b8a7..ecb3edfae5 100644
--- a/projects/WeTek_Play/kodi/advancedsettings.xml
+++ b/projects/WeTek_Play/kodi/advancedsettings.xml
@@ -6,10 +6,6 @@
     <clienttimeout>30</clienttimeout>
   </samba>
 
-  <network>
-    <readbufferfactor>4.0</readbufferfactor>
-  </network>
-
   <pvr>
     <minvideocachelevel>5</minvideocachelevel>
     <minaudiocachelevel>20</minaudiocachelevel>
diff --git a/projects/imx6/kodi/advancedsettings.xml b/projects/imx6/kodi/advancedsettings.xml
index 9faba43f89..e19d88653c 100644
--- a/projects/imx6/kodi/advancedsettings.xml
+++ b/projects/imx6/kodi/advancedsettings.xml
@@ -13,9 +13,4 @@
   <samba>
     <clienttimeout>30</clienttimeout>
   </samba>
-
-  <network>
-    <readbufferfactor>4.0</readbufferfactor>
-  </network>
-
 </advancedsettings>

From 56c6dcc6448893acad8159256045da6e5aa3a200 Mon Sep 17 00:00:00 2001
From: MilhouseVH <milhouseVH.github@nmacleod.com>
Date: Thu, 5 May 2016 15:30:46 +0100
Subject: [PATCH 2/3] kodi: Default to double buffered

---
 packages/mediacenter/kodi/config/appliance.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/mediacenter/kodi/config/appliance.xml b/packages/mediacenter/kodi/config/appliance.xml
index 3baa288a3e..ce248e92da 100644
--- a/packages/mediacenter/kodi/config/appliance.xml
+++ b/packages/mediacenter/kodi/config/appliance.xml
@@ -18,6 +18,11 @@
           <visible>false</visible>
         </setting>
       </group>
+      <group id="3">
+        <setting id="videoscreen.noofbuffers">
+          <default>2</default>
+        </setting>
+      </group>
     </category>
     <category id="audio">
       <group id="1">

From 052cd9b96fcc26486857514632ab2a3f34781094 Mon Sep 17 00:00:00 2001
From: MilhouseVH <milhouseVH.github@nmacleod.com>
Date: Thu, 5 May 2016 15:32:45 +0100
Subject: [PATCH 3/3] kodi: Drop repo hack, no longer needed after PR9642

---
 packages/mediacenter/kodi/scripts/kodi-config | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/packages/mediacenter/kodi/scripts/kodi-config b/packages/mediacenter/kodi/scripts/kodi-config
index d7a26fe100..f0ce394bc1 100755
--- a/packages/mediacenter/kodi/scripts/kodi-config
+++ b/packages/mediacenter/kodi/scripts/kodi-config
@@ -22,23 +22,6 @@
 # done in kodi on addon install. but just in case..
 chmod +x /storage/.kodi/addons/*/bin/*
 
-# Nasty hack to work around OE to LE migration - Addons*.db needs to forget all about OE addons
-ADDONSDB=$(ls -1 /storage/.kodi/userdata/Database/Addons23.db 2>/dev/null)
-if [ -n "${ADDONSDB}" ]; then
-  OEREPO="'repository.openelec.tv'"
-
-  if [ -n "$(sqlite3 $ADDONSDB "SELECT id FROM repo WHERE addonID IN (${OEREPO})")" ]; then
-
-    [ -f ${ADDONSDB}.OE2LE_Backup ] || cp ${ADDONSDB} ${ADDONSDB}.OE2LE_Backup
-
-    sqlite3 $ADDONSDB "DELETE FROM addon WHERE id IN (SELECT idAddon FROM addonlinkrepo a JOIN repo b ON (a.idRepo = b.id) WHERE b.addonID in (${OEREPO}))"
-    sqlite3 $ADDONSDB "DELETE FROM addonextra WHERE id IN (SELECT idAddon FROM addonlinkrepo a JOIN repo b ON (a.idRepo = b.id) WHERE b.addonID in (${OEREPO}))"
-    sqlite3 $ADDONSDB "DELETE FROM dependencies WHERE id IN (SELECT idAddon FROM addonlinkrepo a JOIN repo b ON (a.idRepo = b.id) WHERE b.addonID in (${OEREPO}))"
-    sqlite3 $ADDONSDB "DELETE FROM addonlinkrepo WHERE idRepo in (SELECT id FROM repo WHERE addonID IN (${OEREPO}))"
-    sqlite3 $ADDONSDB "DELETE FROM repo WHERE addonID IN (${OEREPO})"
-  fi
-fi
-
 # hack: update RSSnews.xml in userdata
 if [ -f /storage/.kodi/userdata/RssFeeds.xml ]; then
   sed -e "s,http://libreelec.tv/news?format=feed&type=rss,http://feeds.libreelec.tv/news,g" \