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 5b21c799ee..f991988a58 100755 --- a/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start +++ b/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start @@ -129,18 +129,17 @@ if [ "$ENABLE_XMLTV2VDR" == "true" ] ; then done fi -if [ "$ENABLE_RESTFULAPI" == "true" ] ; then - RESTFULAPI_ARGS="--ip $RESTFULAPI_IP --port $RESTFULAPI_PORT" - if [ ! -z "$RESTFULAPI_EPGIMAGES" ]; then - mkdir -p "$RESTFULAPI_EPGIMAGES" - RESTFULAPI_ARGS="$RESTFULAPI_ARGS --epgimages=\"$RESTFULAPI_EPGIMAGES\"" - fi - if [ ! -z "$RESTFULAPI_CHANNELLOGOS" ]; then - mkdir -p "$RESTFULAPI_CHANNELLOGOS" - RESTFULAPI_ARGS="$RESTFULAPI_ARGS --channellogos=\"$RESTFULAPI_CHANNELLOGOS\"" - fi - VDR_ARG="$VDR_ARG -P 'restfulapi $RESTFULAPI_ARGS'" +if [ ! -d "$ADDON_HOME/epgimages" ]; then + mkdir -p "$ADDON_HOME/epgimages" fi +if [ ! -z "$ADDON_HOME/channellogos" ]; then + mkdir -p "$ADDON_HOME/channellogos" +fi + +RESTFULAPI_ARGS="--ip $RESTFULAPI_IP --port $RESTFULAPI_PORT" +RESTFULAPI_ARGS="$RESTFULAPI_ARGS --epgimages=\"$ADDON_HOME/epgimages\"" +RESTFULAPI_ARGS="$RESTFULAPI_ARGS --channellogos=\"$ADDON_HOME/channellogos\"" +VDR_ARG="$VDR_ARG -P 'restfulapi $RESTFULAPI_ARGS'" # vnsi last VDR_ARG="$VDR_ARG -P vnsiserver" 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 27362beaf3..6f92edaaaf 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 @@ -28,9 +28,7 @@ Enable external recdmd External recdmd path - number of devices - Enable plugin: restfulapi + restfulapi plugin options - listen on ip - listen on port - - Path to the epgimages - - Path to the channellogos 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 ac07980851..9e9dc028bc 100644 --- a/packages/addons/service/multimedia/vdr-addon/source/resources/settings.xml +++ b/packages/addons/service/multimedia/vdr-addon/source/resources/settings.xml @@ -33,12 +33,10 @@ - - - - - + + + diff --git a/packages/addons/service/multimedia/vdr-addon/source/settings-default.xml b/packages/addons/service/multimedia/vdr-addon/source/settings-default.xml index b65e0ca19d..20e96b852c 100644 --- a/packages/addons/service/multimedia/vdr-addon/source/settings-default.xml +++ b/packages/addons/service/multimedia/vdr-addon/source/settings-default.xml @@ -17,13 +17,10 @@ - - + - -