From ca60559882ca682d33deb896ad63c0014317b3ee Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Sun, 25 Mar 2012 14:31:03 +0300
Subject: [PATCH] vdr-addon: add an option to wait for fe initialization

---
 .../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, 7 insertions(+)

diff --git a/packages/addons/service/multimedia/vdr-addon/config/settings.xml b/packages/addons/service/multimedia/vdr-addon/config/settings.xml
index 7898be9965..b69e9636bb 100644
--- a/packages/addons/service/multimedia/vdr-addon/config/settings.xml
+++ b/packages/addons/service/multimedia/vdr-addon/config/settings.xml
@@ -1,4 +1,5 @@
 <settings>
+    <setting id="WAIT_FOR_FEINIT" value="false" />
     <setting id="REMOVE_MODULES" value="" />
     <setting id="ENABLE_DYNAMITE" value="true" />
     <setting id="ENABLE_IPTV" value="false" />
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 cd8f48c254..06bc1e4a5d 100755
--- a/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start
+++ b/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start
@@ -101,6 +101,10 @@ if [ ! "$(pidof vdr.bin)" ];then
     if [ -f "$LOCKDIR/$LOCKFILE" ] ; then
       break
     fi
+    if [ "$WAIT_FOR_FEINIT" == "true" ] && [ ! -e /dev/dvb/adapter*/frontend* ] ; then
+      sleep 1
+      continue
+    fi
     LANG=en_US.UTF-8 LD_LIBRARY_PATH="$ADDON_DIR/lib:$LD_LIBRARY_PATH" vdr.bin $VDR_ARG &>$LOG_FILE
   done &
 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 54b9fe5b35..d496033fdf 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
@@ -4,6 +4,7 @@
 	<string id="1001">Plugins</string>
 	<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="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 db8a2945c1..d12777bf7c 100644
--- a/packages/addons/service/multimedia/vdr-addon/source/resources/settings.xml
+++ b/packages/addons/service/multimedia/vdr-addon/source/resources/settings.xml
@@ -3,6 +3,7 @@
     <category label="1000">
 		<setting label="1020" type="lsep"/>
 		<setting type="sep" />
+		<setting id="WAIT_FOR_FEINIT" type="bool" label="1022" default="false" />
 		<setting id="REMOVE_MODULES" type="text" label="1021" values="" default=""/>
     </category>
     <category label="1001">