From efca389219ebd3f483071d8c7128356556e5c9bf Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Fri, 22 Nov 2013 21:39:17 +0200
Subject: [PATCH] vdr-addon: wirbelscan should always be enabled

- in-xbmc xvdr channel depends on wirbelscan
- trigger channelscan via vnsi4 osd is nice to have
---
 .../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, 1 insertion(+), 6 deletions(-)

diff --git a/packages/addons/service/multimedia/vdr-addon/config/settings.xml b/packages/addons/service/multimedia/vdr-addon/config/settings.xml
index 2d4c1fbb49..a1573a5950 100644
--- a/packages/addons/service/multimedia/vdr-addon/config/settings.xml
+++ b/packages/addons/service/multimedia/vdr-addon/config/settings.xml
@@ -8,7 +8,6 @@
     <setting id="ENABLE_SOFTCAM" value="true" />
     <setting id="ENABLE_STREAMDEV_CLIENT" value="false" />
     <setting id="ENABLE_STREAMDEV_SERVER" value="false" />
-    <setting id="ENABLE_WIRBELSCAN" value="true" />
     <setting id="ENABLE_LIVE" value="false" />
     <setting id="LIVE_IP" value="0.0.0.0" />
     <setting id="LIVE_PORT" value="8008" />
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 1408ca1094..98d6f8a70f 100755
--- a/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start
+++ b/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start
@@ -116,6 +116,7 @@ if [ "$ENABLE_EXTERNAL_RECCMD" == "true" ] ; then
 fi
 
 VDR_ARG="$VDR_ARG -P $PVR_PLUGIN"
+VDR_ARG="$VDR_ARG -P wirbelscan -P wirbelscancontrol"
 
 if [ "$ENABLE_SOFTCAM" == "true" ] ; then
   VDR_ARG="$VDR_ARG -P $SOFTCAM_PLUGIN"
@@ -129,9 +130,6 @@ fi
 if [ "$ENABLE_STREAMDEV_CLIENT" == "true" ] ; then
   VDR_ARG="$VDR_ARG -P streamdev-client"
 fi
-if [ "$ENABLE_WIRBELSCAN" == "true" ] ; then
-  VDR_ARG="$VDR_ARG -P wirbelscan -P wirbelscancontrol"
-fi
 if [ "$ENABLE_LIVE" == "true" ] ; then
   VDR_ARG="$VDR_ARG -P 'live -i $LIVE_IP -p $LIVE_PORT'"
 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 568f515bed..9b86038424 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
@@ -11,7 +11,6 @@
 	<string id="1031">Enable plugin: iptv</string>
 	<string id="1032">Enable plugin: streamdev-client</string>
 	<string id="1033">Enable plugin: streamdev-server</string>
-	<string id="1034">Enable plugin: wirbelscan</string>
 	<string id="1036">Enable softcam</string>
 	<string id="1037">softcam plugin</string>
 	<string id="1038">Enable plugin: live</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 a03e466466..824a6d11f9 100644
--- a/packages/addons/service/multimedia/vdr-addon/source/resources/settings.xml
+++ b/packages/addons/service/multimedia/vdr-addon/source/resources/settings.xml
@@ -22,7 +22,6 @@
 		<setting id="ENABLE_IPTV" type="bool" label="1031" default="false" />
 		<setting id="ENABLE_STREAMDEV_CLIENT" type="bool" label="1032" default="false" />
 		<setting id="ENABLE_STREAMDEV_SERVER" type="bool" label="1033" default="false" />
-		<setting id="ENABLE_WIRBELSCAN" type="bool" label="1034" default="true" />
 		<setting id="ENABLE_LIVE" type="bool" label="1038" default="false" />
 		<setting id="LIVE_IP" type="ipaddress" label="1039" values="" enable="!eq(-1,false)" default="0.0.0.0"/>
 		<setting id="LIVE_PORT" type="number" label="1040" values="" enable="!eq(-2,false)"  default="8008"/>