From ee0ba5e0e1f6ee859397f7962909efa678353cdc Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Thu, 2 May 2013 18:43:15 +0300
Subject: [PATCH] Revert "vdr-addon: add 'enable svdrp' option. epgsearch now
 uses svdrp port instead of streamdev's vtp port"

This reverts commit ade7de160bffe8381c7cf616da24bbc8f5efc916.
---
 .../service/multimedia/vdr-addon/changelog.txt  |  1 -
 .../multimedia/vdr-addon/config/settings.xml    |  1 -
 .../multimedia/vdr-addon/source/bin/vdr.start   | 17 ++++-------------
 .../resources/language/English/strings.xml      |  1 -
 .../vdr-addon/source/resources/settings.xml     |  3 +--
 5 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/packages/addons/service/multimedia/vdr-addon/changelog.txt b/packages/addons/service/multimedia/vdr-addon/changelog.txt
index 027b32aa58..94d2624b81 100644
--- a/packages/addons/service/multimedia/vdr-addon/changelog.txt
+++ b/packages/addons/service/multimedia/vdr-addon/changelog.txt
@@ -3,7 +3,6 @@
 - cleanup epgsources handling
 - * support for multiple epgsources
 - * support user defined epgsources
-- fixed epgsearch plugin not working without streamdev-server
 
 3.0.6
 - fix startup error in vnsiserver / 32bit
diff --git a/packages/addons/service/multimedia/vdr-addon/config/settings.xml b/packages/addons/service/multimedia/vdr-addon/config/settings.xml
index 6ea9720a3a..8b2ae20244 100644
--- a/packages/addons/service/multimedia/vdr-addon/config/settings.xml
+++ b/packages/addons/service/multimedia/vdr-addon/config/settings.xml
@@ -15,7 +15,6 @@
     <setting id="ENABLE_CONTROL" value="false" />
     <setting id="CONTROL_PORT" value="2002" />
     <setting id="ENABLE_ROTORNG" value="false" />
-    <setting id="ENABLE_SVDRP" value="false" />
     <setting id="ENABLE_EPGSEARCH" value="false" />
     <setting id="ENABLE_XMLTV2VDR" value="false" />
     <setting id="SOFTCAM_PLUGIN" value="sc" />
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 dc7007701a..01a3b9e3da 100755
--- a/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start
+++ b/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start
@@ -62,14 +62,7 @@ done
 . /var/config/vdr.conf.default
 . /var/config/vdr.conf
 
-VDR_ARG="-g /tmp --no-kbd --log=3"
-
-if [ "$ENABLE_SVDRP" == "true" ] ; then
-  VDR_ARG="$VDR_ARG --port=6419"
-else
-  VDR_ARG="$VDR_ARG --port=0"
-fi
-
+VDR_ARG="-g /tmp --no-kbd --log=3 --port=0"
 VDR_ARG="$VDR_ARG --config=$ADDON_CONFIG_DIR"
 VDR_ARG="$VDR_ARG --resdir=$ADDON_DIR/res"
 VDR_ARG="$VDR_ARG --cachedir=$ADDON_CACHE_DIR"
@@ -106,10 +99,8 @@ fi
 if [ "$ENABLE_CONTROL" == "true" ] ; then
   VDR_ARG="$VDR_ARG -P 'control -p $CONTROL_PORT'"
 fi
-if [ "$ENABLE_SVDRP" == "true" ] ; then
-  if [ "$ENABLE_EPGSEARCH" == "true" ] ; then
-    VDR_ARG="$VDR_ARG -P epgsearch"
-  fi
+if [ "$ENABLE_EPGSEARCH" == "true" ] ; then
+  VDR_ARG="$VDR_ARG -P epgsearch"
 fi
 if [ "$ENABLE_XMLTV2VDR" == "true" ] ; then
   VDR_ARG="$VDR_ARG -P xmltv2vdr"
@@ -134,7 +125,7 @@ fi
     sed -i -e '/^epgsearch.SVDRPPort.*$/d' $ADDON_CONFIG_DIR/setup.conf
   fi
   cat >>$ADDON_CONFIG_DIR/setup.conf << MYDATA
-epgsearch.SVDRPPort = 6419
+epgsearch.SVDRPPort = 2004
 MYDATA
 
 )
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 d51af3c3ee..8a11574686 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
@@ -27,5 +27,4 @@
 	<string id="1053">PVR plugin</string>
 	<string id="1054">Enable dvb(sd|hd)device plugin</string>
 	<string id="1055">plugin</string>
-	<string id="1056">Enable SVDRP</string>
 </strings>
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 498e8cdb94..36020ce737 100644
--- a/packages/addons/service/multimedia/vdr-addon/source/resources/settings.xml
+++ b/packages/addons/service/multimedia/vdr-addon/source/resources/settings.xml
@@ -26,8 +26,7 @@
 		<setting id="ENABLE_CONTROL" type="bool" label="1042" default="false" />
 		<setting id="CONTROL_PORT" type="number" label="1043" values="" enable="!eq(-1,false)"  default="2002"/>
 		<setting id="ENABLE_ROTORNG" type="bool" label="1041" default="false" />
-		<setting id="ENABLE_SVDRP" type="bool" label="1056" default="false" />
-		<setting id="ENABLE_EPGSEARCH" type="bool" label="1044" default="false" enable="!eq(-1,false)" />
+		<setting id="ENABLE_EPGSEARCH" type="bool" label="1044" default="false" />
 		<setting id="ENABLE_XMLTV2VDR" type="bool" label="1045" default="false" />
 		<setting type="sep" />
 		<setting id="ENABLE_SOFTCAM" type="bool" label="1036" default="true" />