From 680b9e6081b81500ab363001a53a077a1f537f91 Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Fri, 3 Apr 2015 15:08:00 +0300
Subject: [PATCH] vdr-addon: remove xvdr plugin

---
 packages/addons/service/multimedia/vdr-addon/package.mk   | 8 +-------
 .../service/multimedia/vdr-addon/source/bin/vdr.start     | 4 ++--
 .../source/resources/language/English/strings.xml         | 1 -
 .../multimedia/vdr-addon/source/resources/settings.xml    | 1 -
 .../multimedia/vdr-addon/source/settings-default.xml      | 1 -
 5 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/packages/addons/service/multimedia/vdr-addon/package.mk b/packages/addons/service/multimedia/vdr-addon/package.mk
index 0051cd1711..1f2ff2d1d0 100644
--- a/packages/addons/service/multimedia/vdr-addon/package.mk
+++ b/packages/addons/service/multimedia/vdr-addon/package.mk
@@ -24,7 +24,7 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.openelec.tv"
 PKG_URL=""
-PKG_DEPENDS_TARGET="toolchain attr libcap vdr vdr-plugin-xvdr vdr-plugin-vnsiserver vdr-iptv vdr-wirbelscan vdr-wirbelscancontrol vdr-plugin-dvbapi vdr-plugin-streamdev vdr-live vdr-epgsearch vdr-plugin-xmltv2vdr vdr-plugin-eepg vdr-dummydevice vdr-satip vdr-plugin-epgfixer vdr-plugin-restfulapi"
+PKG_DEPENDS_TARGET="toolchain attr libcap vdr vdr-plugin-vnsiserver vdr-iptv vdr-wirbelscan vdr-wirbelscancontrol vdr-plugin-dvbapi vdr-plugin-streamdev vdr-live vdr-epgsearch vdr-plugin-xmltv2vdr vdr-plugin-eepg vdr-dummydevice vdr-satip vdr-plugin-epgfixer vdr-plugin-restfulapi"
 PKG_PRIORITY="optional"
 PKG_SECTION="service.multimedia"
 PKG_SHORTDESC="vdr: A powerful DVB TV application"
@@ -45,7 +45,6 @@ makeinstall_target() {
 addon() {
   VDR_DIR="$(get_build_dir vdr)"
   VDR_LIVE_DIR="$(get_build_dir vdr-live)"
-  VDR_PLUGIN_XVDR_DIR="$(get_build_dir vdr-plugin-xvdr)"
   VDR_PLUGIN_VNSISERVER_DIR="$(get_build_dir vdr-plugin-vnsiserver)"
   VDR_PLUGIN_STREAMVEV_DIR="$(get_build_dir vdr-plugin-streamdev)"
   VDR_PLUGIN_XMLTV2VDR="$(get_build_dir vdr-plugin-xmltv2vdr)"
@@ -72,7 +71,6 @@ addon() {
   cp $VDR_PLUGIN_XMLTV2VDR/dist/epgdata2xmltv/epgdata2xmltv.dist $ADDON_BUILD/$PKG_ADDON_ID/config/epgsources/epgdata2xmltv
 
   mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/plugin
-  cp -PR $VDR_PLUGIN_XVDR_DIR/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
   cp -PR $VDR_PLUGIN_VNSISERVER_DIR/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
   cp -PR $(get_build_dir vdr-iptv)/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
   cp -PR $(get_build_dir vdr-wirbelscan)/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
@@ -91,10 +89,6 @@ addon() {
 
   mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/eepg
 
-  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/xvdr
-  cp -PR $VDR_PLUGIN_XVDR_DIR/xvdr/allowed_hosts.conf $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/xvdr
-  cp -PR $VDR_PLUGIN_XVDR_DIR/xvdr/xvdr.conf $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/xvdr
-
   mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/vnsiserver
   cp -PR $VDR_PLUGIN_VNSISERVER_DIR/vnsiserver/allowed_hosts.conf $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/vnsiserver
 
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 4df232b691..5b21c799ee 100755
--- a/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start
+++ b/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start
@@ -142,8 +142,8 @@ if [ "$ENABLE_RESTFULAPI" == "true" ] ; then
   VDR_ARG="$VDR_ARG -P 'restfulapi $RESTFULAPI_ARGS'"
 fi
 
-# vnsi/xvdr last
-VDR_ARG="$VDR_ARG -P $PVR_PLUGIN"
+# vnsi last
+VDR_ARG="$VDR_ARG -P vnsiserver"
 
 cd $ADDON_DIR/config
 mkdir -p $ADDON_CONFIG_DIR
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 ddc49e0f62..27362beaf3 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
@@ -25,7 +25,6 @@
 	<string id="1049">Enable plugin: epgfixer</string>
 	<string id="1051">VDR Configuration</string>
 	<string id="1052">VDR Video Dir</string>
-	<string id="1053">PVR plugin</string>
         <string id="1056">Enable external recdmd</string>
         <string id="1057">External recdmd path</string>
         <string id="1058">- number of devices</string>
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 2eb98ac409..ac07980851 100644
--- a/packages/addons/service/multimedia/vdr-addon/source/resources/settings.xml
+++ b/packages/addons/service/multimedia/vdr-addon/source/resources/settings.xml
@@ -20,7 +20,6 @@
     <category label="1001">
 		<setting label="1030" type="lsep"/>
 		<setting type="sep" />
-		<setting id="PVR_PLUGIN" type="labelenum" label="1053" values="xvdr|vnsiserver" default="vnsiserver" />
 		<setting id="ENABLE_IPTV" type="bool" label="1031" default="false" />
 		<setting id="IPTV_NUM_DEVICES" type="slider" option="int" range="1,4" label="1058" visible="!eq(-1,false)" default="1" />
 		<setting id="ENABLE_STREAMDEV_CLIENT" type="bool" label="1032" default="false" />
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 a3ebcf5088..b65e0ca19d 100644
--- a/packages/addons/service/multimedia/vdr-addon/source/settings-default.xml
+++ b/packages/addons/service/multimedia/vdr-addon/source/settings-default.xml
@@ -3,7 +3,6 @@
     <setting id="NUM_ADAPTERS" value="1" />
     <setting id="REMOVE_MODULES" value="" />
     <setting id="VDR_VIDEO_DIR" value="/storage/videos" />
-    <setting id="PVR_PLUGIN" value="vnsiserver" />
     <setting id="ENABLE_IPTV" value="false" />
     <setting id="ENABLE_SOFTCAM" value="true" />
     <setting id="ENABLE_STREAMDEV_CLIENT" value="false" />