diff --git a/packages/addons/service/multimedia/vdr-addon/changelog.txt b/packages/addons/service/multimedia/vdr-addon/changelog.txt index 94d2624b81..027b32aa58 100644 --- a/packages/addons/service/multimedia/vdr-addon/changelog.txt +++ b/packages/addons/service/multimedia/vdr-addon/changelog.txt @@ -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 diff --git a/packages/addons/service/multimedia/vdr-addon/config/settings.xml b/packages/addons/service/multimedia/vdr-addon/config/settings.xml index 8b2ae20244..6ea9720a3a 100644 --- a/packages/addons/service/multimedia/vdr-addon/config/settings.xml +++ b/packages/addons/service/multimedia/vdr-addon/config/settings.xml @@ -15,6 +15,7 @@ + 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 01a3b9e3da..dc7007701a 100755 --- a/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start +++ b/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start @@ -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 ) 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 8a11574686..d51af3c3ee 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,4 +27,5 @@ PVR plugin Enable dvb(sd|hd)device plugin plugin + Enable SVDRP 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 36020ce737..498e8cdb94 100644 --- a/packages/addons/service/multimedia/vdr-addon/source/resources/settings.xml +++ b/packages/addons/service/multimedia/vdr-addon/source/resources/settings.xml @@ -26,7 +26,8 @@ - + +