vdr-addon: add 'enable svdrp' option. epgsearch now uses svdrp port instead of streamdev's vtp port

This commit is contained in:
Stefan Saraev 2013-05-02 18:13:58 +03:00
parent 8d558c1b5b
commit ade7de160b
5 changed files with 18 additions and 5 deletions

View File

@ -3,6 +3,7 @@
- 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

View File

@ -15,6 +15,7 @@
<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" />

View File

@ -62,7 +62,14 @@ done
. /var/config/vdr.conf.default
. /var/config/vdr.conf
VDR_ARG="-g /tmp --no-kbd --log=3 --port=0"
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="$VDR_ARG --config=$ADDON_CONFIG_DIR"
VDR_ARG="$VDR_ARG --resdir=$ADDON_DIR/res"
VDR_ARG="$VDR_ARG --cachedir=$ADDON_CACHE_DIR"
@ -99,8 +106,10 @@ fi
if [ "$ENABLE_CONTROL" == "true" ] ; then
VDR_ARG="$VDR_ARG -P 'control -p $CONTROL_PORT'"
fi
if [ "$ENABLE_EPGSEARCH" == "true" ] ; then
VDR_ARG="$VDR_ARG -P epgsearch"
if [ "$ENABLE_SVDRP" == "true" ] ; then
if [ "$ENABLE_EPGSEARCH" == "true" ] ; then
VDR_ARG="$VDR_ARG -P epgsearch"
fi
fi
if [ "$ENABLE_XMLTV2VDR" == "true" ] ; then
VDR_ARG="$VDR_ARG -P xmltv2vdr"
@ -125,7 +134,7 @@ fi
sed -i -e '/^epgsearch.SVDRPPort.*$/d' $ADDON_CONFIG_DIR/setup.conf
fi
cat >>$ADDON_CONFIG_DIR/setup.conf << MYDATA
epgsearch.SVDRPPort = 2004
epgsearch.SVDRPPort = 6419
MYDATA
)

View File

@ -27,4 +27,5 @@
<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>

View File

@ -26,7 +26,8 @@
<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_EPGSEARCH" type="bool" label="1044" 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_XMLTV2VDR" type="bool" label="1045" default="false" />
<setting type="sep" />
<setting id="ENABLE_SOFTCAM" type="bool" label="1036" default="true" />