jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-24 11:16:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

made the docu and the osd files accessible and allowed to use the options for epgimages and channellogos

Browse Source 
repaired vdr.start

another small fix
This commit is contained in:
Gerald Dachs 2015-01-17 22:12:02 +01:00
parent a0dee49e5d
commit 7a2367f695
7 changed files with 36 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/addons/service/multimedia/vdr-addon/package.mk
View File

@ -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
}

17
packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start
View File

@ -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"

2
packages/addons/service/multimedia/vdr-addon/source/resources/language/English/strings.xml
View File

@ -34,4 +34,6 @@
<string id="1070">Enable plugin: restfulapi</string>
<string id="1071">- listen on ip</string>
<string id="1072">- listen on port</string>
<string id="1073">- Path to the epgimages</string>
<string id="1074">- Path to the channellogos</string>
</strings>

2
packages/addons/service/multimedia/vdr-addon/source/resources/settings.xml
View File

@ -39,6 +39,8 @@
<setting id="ENABLE_RESTFULAPI" type="bool" label="1070" default="false" />
<setting id="RESTFULAPI_IP" type="ipaddress" label="1071" values="" visible="!eq(-1,false)" default="0.0.0.0"/>
<setting id="RESTFULAPI_PORT" type="number" label="1072" values="" visible="!eq(-2,false)" default="8002"/>
<setting id="RESTFULAPI_EPGIMAGES" type="file" label="1073" values="" visible="!eq(-3,false)" default="/storage/.kodi/userdata/addon_data/service.multimedia.vdr-addon/epgimages"/>
<setting id="RESTFULAPI_CHANNELLOGOS" type="file" label="1074" values="" visible="!eq(-4,false)" default="/storage/.kodi/userdata/addon_data/service.multimedia.vdr-addon/channellogos"/>
<setting type="sep" />
<setting id="ENABLE_SOFTCAM" type="bool" label="1036" default="true" />
</category>

2
packages/addons/service/multimedia/vdr-addon/source/settings-default.xml
View File

@ -27,4 +27,6 @@
<setting id="IPTV_NUM_DEVICES" value="1" />
<setting id="RESTFULAPI_IP" value="0.0.0.0" />
<setting id="RESTFULAPI_PORT" value="8002" />
<setting id="RESTFULAPI_EPGIMAGES" value="/storage/.kodi/userdata/addon_data/service.multimedia.vdr-addon/epgimages" />
<setting id="RESTFULAPI_CHANNELLOGOS" value="/storage/.kodi/userdata/addon_data/service.multimedia.vdr-addon/channellogos" />
</settings>

2
packages/multimedia/vdr-plugin-restfulapi/package.mk
View File

@ -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"

15
packages/multimedia/vdr-plugin-restfulapi/patches/vdr-plugin-restfulapi-01_makefile.patch
View File

@ -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)