vdr-addon: remove control plugin

OpenELEC · Apr 3, 2015 · 3aef077 · 3aef077
1 parent 825459c
commit 3aef077
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 43 deletions.
diff --git a/packages/addons/service/multimedia/vdr-addon/config.plugins/remote.conf b/packages/addons/service/multimedia/vdr-addon/config.plugins/remote.conf
diff --git 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-control 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-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_PRIORITY="optional"
 PKG_SECTION="service.multimedia"
 PKG_SHORTDESC="vdr: A powerful DVB TV application"
@@ -60,7 +60,7 @@ addon() {
   cp $VDR_DIR/sources.conf $ADDON_BUILD/$PKG_ADDON_ID/config
   cp $VDR_DIR/svdrphosts.conf $ADDON_BUILD/$PKG_ADDON_ID/config
   echo '0.0.0.0/0' >> $ADDON_BUILD/$PKG_ADDON_ID/config/svdrphosts.conf
-  cp $PKG_DIR/config.plugins/remote.conf $ADDON_BUILD/$PKG_ADDON_ID/config
+
   mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/epgsearch
 
   mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/res/plugins/live
@@ -82,7 +82,6 @@ addon() {
   cp -PR $VDR_PLUGIN_STREAMVEV_DIR/server/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
   cp -PR $VDR_PLUGIN_STREAMVEV_DIR/client/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
   cp -PR $VDR_LIVE_DIR/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
-  cp -PR $(get_build_dir vdr-control)/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
   cp -PR $(get_build_dir vdr-epgsearch)/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
   cp -PR $VDR_PLUGIN_XMLTV2VDR/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
   cp -PR $(get_build_dir vdr-dummydevice)/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin

diff --git a/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start b/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start
@@ -97,9 +97,6 @@ fi
 if [ "$ENABLE_LIVE" == "true" ] ; then
   VDR_ARG="$VDR_ARG -P 'live -i $LIVE_IP -p $LIVE_PORT'"
 fi
-if [ "$ENABLE_CONTROL" == "true" ] ; then
-  VDR_ARG="$VDR_ARG -P 'control -p $CONTROL_PORT'"
-fi
 if [ "$ENABLE_EEPG" == "true" ] ; then
   VDR_ARG="$VDR_ARG -P eepg"
 fi

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
@@ -17,8 +17,6 @@
 	<string id="1038">Enable plugin: live</string>
 	<string id="1039">- listen on ip</string>
 	<string id="1040">- listen on port</string>
-	<string id="1042">Enable plugin: control</string>
-	<string id="1043">- listen on port</string>
 	<string id="1044">Enable plugin: epgsearch</string>
 	<string id="1045">Enable plugin: xmltv2vdr</string>
 	<string id="1046">Enable plugin: extended EPG</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
@@ -28,8 +28,6 @@
 		<setting id="ENABLE_LIVE" type="bool" label="1038" default="false" />
 		<setting id="LIVE_IP" type="ipaddress" label="1039" values="" visible="!eq(-1,false)" default="0.0.0.0"/>
 		<setting id="LIVE_PORT" type="number" label="1040" values="" visible="!eq(-2,false)"  default="8008"/>
-		<setting id="ENABLE_CONTROL" type="bool" label="1042" default="false" />
-		<setting id="CONTROL_PORT" type="number" label="1043" values="" visible="!eq(-1,false)"  default="2002"/>
 		<setting id="ENABLE_EEPG" type="bool" label="1046" default="false" />
 		<setting id="ENABLE_EPGSEARCH" type="bool" label="1044" default="false" />
 		<setting id="ENABLE_XMLTV2VDR" type="bool" label="1045" 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
@@ -11,8 +11,6 @@
     <setting id="ENABLE_LIVE" value="false" />
     <setting id="LIVE_IP" value="0.0.0.0" />
     <setting id="LIVE_PORT" value="8008" />
-    <setting id="ENABLE_CONTROL" value="false" />
-    <setting id="CONTROL_PORT" value="2002" />
     <setting id="ENABLE_EEPG" value="false" />
     <setting id="ENABLE_EPGFIXER" value="false" />
     <setting id="ENABLE_EPGSEARCH" value="false" />