diff --git a/packages/addons/service/multimedia/vdr-addon/config.plugins/remote.conf b/packages/addons/service/multimedia/vdr-addon/config.plugins/remote.conf deleted file mode 100644 index 97a2c6068f..0000000000 --- a/packages/addons/service/multimedia/vdr-addon/config.plugins/remote.conf +++ /dev/null @@ -1,31 +0,0 @@ -KBD.Up 00000000001B5B41 -KBD.Down 00000000001B5B42 -KBD.Menu 000000000000006D -KBD.Ok 000000000000000D -KBD.Back 000000000000007F -KBD.Left 00000000001B5B44 -KBD.Right 00000000001B5B43 -KBD.Red 000000001B5B5B41 -KBD.Green 000000001B5B5B42 -KBD.Yellow 000000001B5B5B43 -KBD.Blue 000000001B5B5B44 -KBD.0 0000000000000030 -KBD.1 0000000000000031 -KBD.2 0000000000000032 -KBD.3 0000000000000033 -KBD.4 0000000000000034 -KBD.5 0000000000000035 -KBD.6 0000000000000036 -KBD.7 0000000000000037 -KBD.8 0000000000000038 -KBD.9 0000000000000039 -KBD.Info 0000000000000069 -KBD.FastFwd 0000001B5B31377E -KBD.FastRew 000000001B5B5B45 -KBD.Power 0000000000000070 -KBD.Volume+ 0000001B5B32347E -KBD.Volume- 0000001B5B32337E -KBD.Mute 0000001B5B32317E -KBD.User7 0000001B5B31387E -KBD.User8 0000001B5B31397E -KBD.User9 0000001B5B32307E diff --git a/packages/addons/service/multimedia/vdr-addon/package.mk b/packages/addons/service/multimedia/vdr-addon/package.mk index b3b721b0d6..0051cd1711 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-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 index 6cb4794756..4df232b691 100755 --- 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 index 39b218c148..ddc49e0f62 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 @@ -17,8 +17,6 @@ Enable plugin: live - listen on ip - listen on port - Enable plugin: control - - listen on port Enable plugin: epgsearch Enable plugin: xmltv2vdr Enable plugin: extended EPG 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 9757eb4665..2eb98ac409 100644 --- 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 @@ - - 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 fd554eeee1..a3ebcf5088 100644 --- 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 @@ - -