Merge pull request #288 from stefansaraev/vdr

vdr update
This commit is contained in:
Stephan Raue 2012-03-08 14:17:14 -08:00
commit 9ca1a322f5
10 changed files with 97 additions and 34 deletions

0
packages/3rdparty/multimedia/vdr-iptv/rename vendored Normal file → Executable file
View File

View File

@ -33,7 +33,6 @@ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config
cp $BUILD/vdr-[0-9]*/sources.conf $ADDON_BUILD/$PKG_ADDON_ID/config
cp $BUILD/vdr-[0-9]*/svdrphosts.conf $ADDON_BUILD/$PKG_ADDON_ID/config
echo '0.0.0.0/0' >> $ADDON_BUILD/$PKG_ADDON_ID/config/svdrphosts.conf
cp -PR $PKG_DIR/config/vdr-sleep.conf $ADDON_BUILD/$PKG_ADDON_ID/config
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/plugin
cp -PR $BUILD/vdr-plugin-xvdr-*/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin

View File

@ -1,3 +1,7 @@
2.0.9
- modules to remove on sleep now configurable via settings ui
- enabled plugins now configurable via settings ui
2.0.8
- update to vdr-1.7.25
- update to vdr-plugin-xvdr-c98852f

View File

@ -1,3 +1,10 @@
<settings>
<setting id="VDR" value="" />
<setting id="REMOVE_MODULES" value="" />
<setting id="ENABLE_DYNAMITE" value="true" />
<setting id="ENABLE_IPTV" value="false" />
<setting id="ENABLE_SOFTCAM" value="true" />
<setting id="ENABLE_STREAMDEV_CLIENT" value="false" />
<setting id="ENABLE_STREAMDEV_SERVER" value="false" />
<setting id="ENABLE_WIRBELSCAN" value="true" />
<setting id="SOFTCAM_PLUGIN" value="sc" />
</settings>

View File

@ -1,6 +0,0 @@
# space-separated list of modules to remove on suspend
# and load on resume
# example:
# REMOVE_MODULES="cx23885 mantis"
REMOVE_MODULES=""

View File

@ -21,7 +21,7 @@
PKG_NAME="vdr-addon"
PKG_VERSION="2.0"
PKG_REV="8"
PKG_REV="9"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://www.openelec.tv"

View File

@ -34,15 +34,41 @@ ADDON_CONFIG_DIR="$ADDON_HOME/config"
ADDON_PLUGIN_DIR="$ADDON_DIR/plugin"
ADDON_VIDEO_DIR="$HOME/videos"
if [ ! -f "$ADDON_SETTINGS" ]; then
cp $ADDON_DIR/settings-default.xml $ADDON_SETTINGS
fi
mkdir -p /var/config
cat "$ADDON_DIR/settings-default.xml" | awk -F\" '{print $2"=\""$4"\""}' | sed '/^=/d' > /var/config/vdr.conf.default
cat "$ADDON_SETTINGS" | awk -F\" '{print $2"=\""$4"\""}' | sed '/^=/d' > /var/config/vdr.conf
. /var/config/vdr.conf.default
. /var/config/vdr.conf
VDR_ARG="-g /tmp --no-kbd --log=3 --port=0"
VDR_ARG="$VDR_ARG --config=$ADDON_CONFIG_DIR"
VDR_ARG="$VDR_ARG --lib=$ADDON_PLUGIN_DIR"
VDR_ARG="$VDR_ARG --video=$ADDON_VIDEO_DIR"
VDR_ARG="$VDR_ARG -P xvdr -P sc -P wirbelscan"
VDR_ARG="$VDR_ARG -P dynamite"
VDR_ARG="$VDR_ARG -P xvdr"
if [ ! -f "$ADDON_SETTINGS" ]; then
cp $ADDON_DIR/settings-default.xml $ADDON_SETTINGS
if [ "$ENABLE_SOFTCAM" == "true" ] ; then
VDR_ARG="$VDR_ARG -P $SOFTCAM_PLUGIN"
fi
if [ "$ENABLE_IPTV" == "true" ] ; then
VDR_ARG="$VDR_ARG -P iptv"
fi
if [ "$ENABLE_STREAMDEV_SERVER" == "true" ] ; then
VDR_ARG="$VDR_ARG -P streamdev-server"
fi
if [ "$ENABLE_STREAMDEV_CLIENT" == "true" ] ; then
VDR_ARG="$VDR_ARG -P streamdev-client"
fi
if [ "$ENABLE_WIRBELSCAN" == "true" ] ; then
VDR_ARG="$VDR_ARG -P wirbelscan"
fi
# dynamite must be LAST loaded plugin
if [ "$ENABLE_DYNAMITE" == "true" ] ; then
VDR_ARG="$VDR_ARG -P dynamite"
fi
(

View File

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<strings>
<string id="1000">DVB</string>
<string id="1001">Plugins</string>
<string id="1020">DVB Configuration</string>
<string id="1021">Unload DVB mudules before suspend</string>
<string id="1030">Plugin Configuration</string>
<string id="1031">Enable plugin: iptv</string>
<string id="1032">Enable plugin: streamdev-client</string>
<string id="1033">Enable plugin: streamdev-server</string>
<string id="1034">Enable plugin: wirbelscan</string>
<string id="1035">Enable plugin: dynamite</string>
<string id="1036">Enable softcam</string>
<string id="1037">softcam plugin</string>
</strings>

View File

@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<settings>
<category label="1000">
<setting label="1020" type="lsep"/>
<setting type="sep" />
<setting id="REMOVE_MODULES" type="text" label="1021" values="" default=""/>
</category>
<category label="1001">
<setting label="1030" type="lsep"/>
<setting type="sep" />
<setting id="ENABLE_IPTV" type="bool" label="1031" default="false" />
<setting id="ENABLE_STREAMDEV_CLIENT" type="bool" label="1032" default="false" />
<setting id="ENABLE_STREAMDEV_SERVER" type="bool" label="1033" default="false" />
<setting id="ENABLE_WIRBELSCAN" type="bool" label="1034" default="true" />
<setting id="ENABLE_DYNAMITE" type="bool" label="1035" default="true" />
<setting type="sep" />
<setting id="ENABLE_SOFTCAM" type="bool" label="1036" default="true" />
<setting id="SOFTCAM_PLUGIN" type="labelenum" label="1037" values="sc" enable="!eq(-1,false)" default="sc" />
</category>
</settings>

View File

@ -24,26 +24,24 @@
ADDON_HOME="$HOME/.xbmc/userdata/addon_data/service.multimedia.vdr-addon"
ADDON_CONFIG_DIR="$ADDON_HOME/config"
ADDON_SETTINGS="$ADDON_HOME/settings.xml"
REMOVE_MODULES=`grep REMOVE_MODULES $ADDON_SETTINGS | awk '{print $3}' | sed -e "s,value=,," -e "s,\",,g"`
if [ -f "$ADDON_CONFIG_DIR/vdr-sleep.conf" ]; then
. "$ADDON_CONFIG_DIR/vdr-sleep.conf"
if [ ! "$REMOVE_MODULES" == "" ] ; then
case "$1" in
hibernate|suspend)
vdr.stop
for module in $REMOVE_MODULES ; do
rmmod -w $module
done
;;
thaw|resume)
for module in $REMOVE_MODULES ; do
modprobe $module
done
xbmc-send --host=127.0.0.1 -a "XBMC.RunScript(service.multimedia.vdr-addon)" &
;;
*) exit $NA
;;
esac
fi
if [ ! "$REMOVE_MODULES" == "" ] ; then
case "$1" in
hibernate|suspend)
vdr.stop
for module in $REMOVE_MODULES ; do
rmmod -w $module
done
;;
thaw|resume)
for module in $REMOVE_MODULES ; do
modprobe $module
done
xbmc-send --host=127.0.0.1 -a "XBMC.RunScript(service.multimedia.vdr-addon)" &
;;
*) exit $NA
;;
esac
fi