diff --git a/packages/addons/service/multimedia/vdr-addon/package.mk b/packages/addons/service/multimedia/vdr-addon/package.mk index 25352b1979..07040804b8 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-sc vdr-plugin-dvbapi vdr-plugin-streamdev vdr-live vdr-control vdr-epgsearch vdr-plugin-xmltv2vdr vdr-plugin-eepg vdr-dummydevice vdr-satip" +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" PKG_PRIORITY="optional" PKG_SECTION="service.multimedia" PKG_SHORTDESC="vdr: A powerful DVB TV application" @@ -46,7 +46,6 @@ addon() { 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_SC_DIR="$(get_build_dir vdr-sc)" VDR_PLUGIN_STREAMVEV_DIR="$(get_build_dir vdr-plugin-streamdev)" VDR_PLUGIN_XMLTV2VDR="$(get_build_dir vdr-plugin-xmltv2vdr)" @@ -77,8 +76,6 @@ addon() { cp -PR $(get_build_dir vdr-wirbelscancontrol)/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin cp -PR $(get_build_dir vdr-plugin-dvbapi)/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin cp -PR $(get_build_dir vdr-plugin-eepg)/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin - cp -PR $VDR_SC_DIR/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin - cp -PR $VDR_SC_DIR/systems/*/libsc*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin 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 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 eb6bcfc0ac..8fb4af986f 100755 --- a/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start +++ b/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start @@ -78,7 +78,7 @@ fi # keep softcam first if [ "$ENABLE_SOFTCAM" == "true" ] ; then - VDR_ARG="$VDR_ARG -P $SOFTCAM_PLUGIN" + VDR_ARG="$VDR_ARG -P dvbapi" fi VDR_ARG="$VDR_ARG -P wirbelscan -P wirbelscancontrol" if [ "$ENABLE_IPTV" == "true" ] ; then 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 755d059c0e..68a2d525ae 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 @@ -11,8 +11,7 @@ Enable plugin: iptv Enable plugin: streamdev-client Enable plugin: streamdev-server - Enable softcam - softcam plugin + Enable softcam (dvbapi) Enable plugin: live - listen on ip - listen on port 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 63d798052c..b432e5fdee 100644 --- a/packages/addons/service/multimedia/vdr-addon/source/resources/settings.xml +++ b/packages/addons/service/multimedia/vdr-addon/source/resources/settings.xml @@ -34,6 +34,5 @@ - 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 bf33d6ef29..b554c412e6 100644 --- a/packages/addons/service/multimedia/vdr-addon/source/settings-default.xml +++ b/packages/addons/service/multimedia/vdr-addon/source/settings-default.xml @@ -18,7 +18,6 @@ -