diff --git a/packages/addons/service/multimedia/vdr-addon/package.mk b/packages/addons/service/multimedia/vdr-addon/package.mk
index bca16c8c58..335438afec 100644
--- a/packages/addons/service/multimedia/vdr-addon/package.mk
+++ b/packages/addons/service/multimedia/vdr-addon/package.mk
@@ -110,4 +110,8 @@ addon() {
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/epgfixer
cp -PR $VDR_PLUGIN_EPGFIXER_DIR/epgfixer/*.conf $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/epgfixer
+
+ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/res/plugins/restfulapi
+ cp -P $VDR_PLUGIN_RESTFULAPI_DIR/web/* $ADDON_BUILD/$PKG_ADDON_ID/res/plugins/restfulapi
+ cp -P $VDR_PLUGIN_RESTFULAPI_DIR/API.html $ADDON_BUILD/$PKG_ADDON_ID/res/plugins/restfulapi
}
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 3727d38688..ee21d76456 100755
--- a/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start
+++ b/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start
@@ -133,9 +133,24 @@ if [ "$ENABLE_XMLTV2VDR" == "true" ] ; then
cp $source /var/lib/epgsources
done
fi
+
if [ "$ENABLE_RESTFULAPI" == "true" ] ; then
- VDR_ARG="$VDR_ARG -P 'restfulapi --ip $RESTFULAPI_IP --port $RESTFULAPI_PORT'"
+ RESTFULAPI_ARGS="--ip $RESTFULAPI_IP --port $RESTFULAPI_PORT"
+ if [ ! -z "$RESTFULAPI_EPGIMAGES" ]; then
+ if [ ! -f "$RESTFULAPI_EPGIMAGES" ]; then
+ mkdir -p "$RESTFULAPI_EPGIMAGES"
+ fi
+ RESTFULAPI_ARGS="$RESTFULAPI_ARGS --epgimages=\"$RESTFULAPI_EPGIMAGES\""
+ fi
+ if [ ! -z "$RESTFULAPI_CHANNELLOGOS" ]; then
+ if [ ! -f "$RESTFULAPI_CHANNELLOGOS" ]; then
+ mkdir -p "$RESTFULAPI_CHANNELLOGOS"
+ fi
+ RESTFULAPI_ARGS="$RESTFULAPI_ARGS --channellogos=\"$RESTFULAPI_CHANNELLOGOS\""
+ fi
+ VDR_ARG="$VDR_ARG -P 'restfulapi $RESTFULAPI_ARGS'"
fi
+
# vnsi/xvdr last
VDR_ARG="$VDR_ARG -P $PVR_PLUGIN"
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 4570b689ff..edbfd231c0 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
@@ -34,4 +34,6 @@
Enable plugin: restfulapi
- 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 f200781061..9757eb4665 100644
--- a/packages/addons/service/multimedia/vdr-addon/source/resources/settings.xml
+++ b/packages/addons/service/multimedia/vdr-addon/source/resources/settings.xml
@@ -39,6 +39,8 @@
+
+
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 aef106a3cd..fd554eeee1 100644
--- a/packages/addons/service/multimedia/vdr-addon/source/settings-default.xml
+++ b/packages/addons/service/multimedia/vdr-addon/source/settings-default.xml
@@ -27,4 +27,6 @@
+
+
diff --git a/packages/multimedia/vdr-plugin-restfulapi/package.mk b/packages/multimedia/vdr-plugin-restfulapi/package.mk
index 93e4e14ff8..3a3f71a06d 100644
--- a/packages/multimedia/vdr-plugin-restfulapi/package.mk
+++ b/packages/multimedia/vdr-plugin-restfulapi/package.mk
@@ -17,7 +17,7 @@
################################################################################
PKG_NAME="vdr-plugin-restfulapi"
-PKG_VERSION="20150115225816unstable"
+PKG_VERSION="20150117203925unstable"
PKG_REV="0yavdr0~trusty"
PKG_ARCH="any"
PKG_LICENSE="GPL"
diff --git a/packages/multimedia/vdr-plugin-restfulapi/patches/vdr-plugin-restfulapi-01_makefile.patch b/packages/multimedia/vdr-plugin-restfulapi/patches/vdr-plugin-restfulapi-01_makefile.patch
index fd330f1d4d..8431853eeb 100644
--- a/packages/multimedia/vdr-plugin-restfulapi/patches/vdr-plugin-restfulapi-01_makefile.patch
+++ b/packages/multimedia/vdr-plugin-restfulapi/patches/vdr-plugin-restfulapi-01_makefile.patch
@@ -1,5 +1,5 @@
---- vdr-plugin-restfulapi.orig/Makefile 2015-01-15 22:13:47.000000000 +0100
-+++ vdr-plugin-restfulapi/Makefile 2015-01-14 23:04:43.361230469 +0100
+--- vdr-plugin-restfulapi.orig/Makefile 2015-01-17 19:15:51.425203423 +0100
++++ vdr-plugin-restfulapi/Makefile 2015-01-17 20:12:27.336707418 +0100
@@ -16,21 +16,16 @@
### The directory environment:
@@ -24,20 +24,23 @@
### Allow user defined options to overwrite defaults:
-@@ -47,9 +42,11 @@
+@@ -47,9 +42,13 @@
### Includes and Defines (add further entries here):
+-DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
+INCLUDES += -I$(VDRDIR)/include
-+
- DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
-LIBS += $(shell cxxtools-config --libs) -lcxxtools-http
++DOCUMENT_ROOT=/storage/.kodi/addons/service.multimedia.vdr-addon/res/plugins/restfulapi/
++
++DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"' -DDOCUMENT_ROOT='"$(DOCUMENT_ROOT)"'
++
+LIBS += -lcxxtools-http $(shell cxxtools-config --libs)
CONFDIR = $(call PKGCFG,configdir)
PLGCONFDIR = $(CONFDIR)/plugins/$(PLUGIN)
-@@ -106,6 +103,7 @@
+@@ -106,6 +105,7 @@
$(SOFILE): $(OBJS)
$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@ -Wl,--no-whole-archive $(LIBS)