From 4b081c7df5877fd22c140c1ba6f9924b0b3884eb Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Mon, 13 Aug 2012 21:54:31 +0300
Subject: [PATCH 1/2] hts-tvheadend: add an option to wait for more than 1
 adapters to appear

---
 .../service/multimedia/hts-tvheadend/config/settings.xml      | 1 +
 .../multimedia/hts-tvheadend/source/bin/tvheadend.start       | 4 +++-
 .../source/resources/language/English/strings.xml             | 1 +
 .../multimedia/hts-tvheadend/source/resources/settings.xml    | 1 +
 4 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/addons/service/multimedia/hts-tvheadend/config/settings.xml b/packages/addons/service/multimedia/hts-tvheadend/config/settings.xml
index 71317cd4ce..8fec81edba 100644
--- a/packages/addons/service/multimedia/hts-tvheadend/config/settings.xml
+++ b/packages/addons/service/multimedia/hts-tvheadend/config/settings.xml
@@ -1,5 +1,6 @@
 <settings>
     <setting id="WAIT_FOR_FEINIT" value="false" />
+    <setting id="NUM_ADAPTERS" value="1" />
     <setting id="XMLTV_LOCATION_FILE" value="" />
     <setting id="XMLTV_LOCATION_WEB" value="http://" />
     <setting id="XMLTV_TYPE" value="NONE" />
diff --git a/packages/addons/service/multimedia/hts-tvheadend/source/bin/tvheadend.start b/packages/addons/service/multimedia/hts-tvheadend/source/bin/tvheadend.start
index 796369e49e..2014cff73d 100755
--- a/packages/addons/service/multimedia/hts-tvheadend/source/bin/tvheadend.start
+++ b/packages/addons/service/multimedia/hts-tvheadend/source/bin/tvheadend.start
@@ -80,7 +80,9 @@ mkdir -p $ADDON_HOME
       if [ -f "$LOCKDIR/$LOCKFILE" ] ; then
         break
       fi
-      if [ "$WAIT_FOR_FEINIT" == "true" ] && [ ! -e /dev/dvb/adapter*/frontend* ] ; then
+      # (wait for) at least 1 adapter (xbmc allows to set 0)
+      [ $NUM_ADAPTERS -lt 1 ] && NUM_ADAPTERS=1
+      if [ "$WAIT_FOR_FEINIT" == "true" ] && [ ! -e /dev/dvb/adapter$((NUM_ADAPTERS-1))/frontend* ] ; then
         sleep 1
         continue
       fi
diff --git a/packages/addons/service/multimedia/hts-tvheadend/source/resources/language/English/strings.xml b/packages/addons/service/multimedia/hts-tvheadend/source/resources/language/English/strings.xml
index 3b6c054e15..f718c0d9bd 100644
--- a/packages/addons/service/multimedia/hts-tvheadend/source/resources/language/English/strings.xml
+++ b/packages/addons/service/multimedia/hts-tvheadend/source/resources/language/English/strings.xml
@@ -11,5 +11,6 @@
 	<string id="1020">DVB Configuration</string>
 	<string id="1021">Unload DVB mudules before suspend</string>
 	<string id="1022">Wait for frontend initialization</string>
+	<string id="1023">Number of adapters to wait for</string>
 
 </strings>
diff --git a/packages/addons/service/multimedia/hts-tvheadend/source/resources/settings.xml b/packages/addons/service/multimedia/hts-tvheadend/source/resources/settings.xml
index 59ff7fde8b..3a84c2d295 100644
--- a/packages/addons/service/multimedia/hts-tvheadend/source/resources/settings.xml
+++ b/packages/addons/service/multimedia/hts-tvheadend/source/resources/settings.xml
@@ -13,6 +13,7 @@
 		<setting label="1020" type="lsep"/>
 		<setting type="sep" />
 		<setting id="WAIT_FOR_FEINIT" type="bool" label="1022" default="false" />
+		<setting id="NUM_ADAPTERS" type="number" label="1023" default="1" enable="eq(-1,true)" />
 		<setting id="REMOVE_MODULES" type="text" label="1021" values="" default=""/>
     </category>
 </settings>

From da50933363966629f19ea2fce28d78f9cb87a799 Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Mon, 13 Aug 2012 21:54:35 +0300
Subject: [PATCH 2/2] vdr-addon: add an option to wait for more than 1 adapters
 to appear

---
 .../addons/service/multimedia/vdr-addon/config/settings.xml   | 1 +
 .../addons/service/multimedia/vdr-addon/source/bin/vdr.start  | 4 +++-
 .../vdr-addon/source/resources/language/English/strings.xml   | 1 +
 .../multimedia/vdr-addon/source/resources/settings.xml        | 1 +
 4 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/addons/service/multimedia/vdr-addon/config/settings.xml b/packages/addons/service/multimedia/vdr-addon/config/settings.xml
index 3e4f06fafa..c20d288e02 100644
--- a/packages/addons/service/multimedia/vdr-addon/config/settings.xml
+++ b/packages/addons/service/multimedia/vdr-addon/config/settings.xml
@@ -1,5 +1,6 @@
 <settings>
     <setting id="WAIT_FOR_FEINIT" value="false" />
+    <setting id="NUM_ADAPTERS" value="1" />
     <setting id="REMOVE_MODULES" value="" />
     <setting id="VDR_VIDEO_DIR" value="/storage/videos" />
     <setting id="ENABLE_DYNAMITE" value="true" />
diff --git a/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start b/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start
index 3c87b62165..b2d9efce6b 100755
--- a/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start
+++ b/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start
@@ -145,7 +145,9 @@ if [ ! "$(pidof vdr.bin)" ];then
     if [ -f "$LOCKDIR/$LOCKFILE" ] ; then
       break
     fi
-    if [ "$WAIT_FOR_FEINIT" == "true" ] && [ ! -e /dev/dvb/adapter*/frontend* ] ; then
+    # (wait for) at least 1 adapter (xbmc allows to set 0)
+    [ $NUM_ADAPTERS -lt 1 ] && NUM_ADAPTERS=1
+    if [ "$WAIT_FOR_FEINIT" == "true" ] && [ ! -e /dev/dvb/adapter$((NUM_ADAPTERS-1))/frontend* ] ; then
       sleep 1
       continue
     fi
diff --git a/packages/addons/service/multimedia/vdr-addon/source/resources/language/English/strings.xml b/packages/addons/service/multimedia/vdr-addon/source/resources/language/English/strings.xml
index 63c7a3b21e..cf98f031a9 100644
--- a/packages/addons/service/multimedia/vdr-addon/source/resources/language/English/strings.xml
+++ b/packages/addons/service/multimedia/vdr-addon/source/resources/language/English/strings.xml
@@ -6,6 +6,7 @@
 	<string id="1020">DVB Configuration</string>
 	<string id="1021">Unload DVB mudules before suspend</string>
 	<string id="1022">Wait for frontend initialization</string>
+	<string id="1023">Number of adapters to wait for</string>
 	<string id="1030">Plugin Configuration</string>
 	<string id="1031">Enable plugin: iptv</string>
 	<string id="1032">Enable plugin: streamdev-client</string>
diff --git a/packages/addons/service/multimedia/vdr-addon/source/resources/settings.xml b/packages/addons/service/multimedia/vdr-addon/source/resources/settings.xml
index 6153ea7578..465ab5559a 100644
--- a/packages/addons/service/multimedia/vdr-addon/source/resources/settings.xml
+++ b/packages/addons/service/multimedia/vdr-addon/source/resources/settings.xml
@@ -4,6 +4,7 @@
 		<setting label="1020" type="lsep"/>
 		<setting type="sep" />
 		<setting id="WAIT_FOR_FEINIT" type="bool" label="1022" default="false" />
+		<setting id="NUM_ADAPTERS" type="number" label="1023" default="1" enable="eq(-1,true)" />
 		<setting id="REMOVE_MODULES" type="text" label="1021" values="" default=""/>
     </category>
     <category label="1002">