From 2689cd4218201ae9ea35238684757196a1900d2b Mon Sep 17 00:00:00 2001 From: vpeter4 Date: Thu, 21 Feb 2013 16:45:48 +0100 Subject: [PATCH] sundtek-mediatv: bump version added addon settings enable HW PID filter (enabled for RPi by default) enable IR receiver allow sharing local tuner over network use network tuners sundtek's binaries are downloaded on first run automatically download new version of the binaries if available added preload library to .profile (to run mediaclient, w_scan, ... from console) --- .../driver/{sundtek => sundtek-mediatv}/addon | 0 .../changelog.txt | 9 +-- .../config/sundtek.conf | 3 - .../config/sundtek.conf.full | 0 .../icon/icon.png | Bin .../driver/{sundtek => sundtek-mediatv}/meta | 4 +- .../settings-default.xml | 0 .../source/bin/sundtek.start | 2 +- .../source/bin/sundtek.stop | 2 +- .../source/bin/userspace-driver.sh | 57 ++++++++---------- .../source/default.py | 0 .../resources/language/English/strings.xml | 0 .../source/resources/settings.xml | 14 ++--- .../source/sleep.d/sundtek-mediatv.power} | 8 +-- .../sundtek/source/bin/device-attached.sh | 25 -------- 15 files changed, 43 insertions(+), 81 deletions(-) rename packages/addons/driver/{sundtek => sundtek-mediatv}/addon (100%) rename packages/addons/driver/{sundtek => sundtek-mediatv}/changelog.txt (89%) rename packages/addons/driver/{sundtek => sundtek-mediatv}/config/sundtek.conf (78%) rename packages/addons/driver/{sundtek => sundtek-mediatv}/config/sundtek.conf.full (100%) rename packages/addons/driver/{sundtek => sundtek-mediatv}/icon/icon.png (100%) rename packages/addons/driver/{sundtek => sundtek-mediatv}/meta (97%) rename packages/addons/driver/{sundtek => sundtek-mediatv}/settings-default.xml (100%) rename packages/addons/driver/{sundtek => sundtek-mediatv}/source/bin/sundtek.start (95%) rename packages/addons/driver/{sundtek => sundtek-mediatv}/source/bin/sundtek.stop (95%) rename packages/addons/driver/{sundtek => sundtek-mediatv}/source/bin/userspace-driver.sh (86%) rename packages/addons/driver/{sundtek => sundtek-mediatv}/source/default.py (100%) rename packages/addons/driver/{sundtek => sundtek-mediatv}/source/resources/language/English/strings.xml (100%) rename packages/addons/driver/{sundtek => sundtek-mediatv}/source/resources/settings.xml (72%) rename packages/addons/driver/{sundtek/source/sleep.d/sundtek.power => sundtek-mediatv/source/sleep.d/sundtek-mediatv.power} (91%) delete mode 100644 packages/addons/driver/sundtek/source/bin/device-attached.sh diff --git a/packages/addons/driver/sundtek/addon b/packages/addons/driver/sundtek-mediatv/addon similarity index 100% rename from packages/addons/driver/sundtek/addon rename to packages/addons/driver/sundtek-mediatv/addon diff --git a/packages/addons/driver/sundtek/changelog.txt b/packages/addons/driver/sundtek-mediatv/changelog.txt similarity index 89% rename from packages/addons/driver/sundtek/changelog.txt rename to packages/addons/driver/sundtek-mediatv/changelog.txt index be4e096e2a..f3f1d1e893 100644 --- a/packages/addons/driver/sundtek/changelog.txt +++ b/packages/addons/driver/sundtek-mediatv/changelog.txt @@ -1,14 +1,9 @@ -3.0.3 - new addon settings: +3.0.1 + added addon settings enable HW PID filter (enabled for RPi by default) enable IR receiver allow sharing local tuner over network use network tuners -3.0.2 - special version -3.0.1 - addon renamed to just sundtek - added addon settings sundtek's binaries are downloaded on first run automatically download new version of the binaries if available added preload library to .profile (to run mediaclient, w_scan, ... from console) diff --git a/packages/addons/driver/sundtek/config/sundtek.conf b/packages/addons/driver/sundtek-mediatv/config/sundtek.conf similarity index 78% rename from packages/addons/driver/sundtek/config/sundtek.conf rename to packages/addons/driver/sundtek-mediatv/config/sundtek.conf index 15a81288a6..5f9d4acadb 100644 --- a/packages/addons/driver/sundtek/config/sundtek.conf +++ b/packages/addons/driver/sundtek-mediatv/config/sundtek.conf @@ -1,9 +1,6 @@ # # sundtek.conf # -# Call attach/detach script when new device appears/disappears -# Do not change this line (OpenElec addon require this) ! -device_attach=/storage/.xbmc/addons/driver.dvb.sundtek/bin/device-attached.sh # enable HW PID filter (default on for RPi) use_hwpidfilter=off diff --git a/packages/addons/driver/sundtek/config/sundtek.conf.full b/packages/addons/driver/sundtek-mediatv/config/sundtek.conf.full similarity index 100% rename from packages/addons/driver/sundtek/config/sundtek.conf.full rename to packages/addons/driver/sundtek-mediatv/config/sundtek.conf.full diff --git a/packages/addons/driver/sundtek/icon/icon.png b/packages/addons/driver/sundtek-mediatv/icon/icon.png similarity index 100% rename from packages/addons/driver/sundtek/icon/icon.png rename to packages/addons/driver/sundtek-mediatv/icon/icon.png diff --git a/packages/addons/driver/sundtek/meta b/packages/addons/driver/sundtek-mediatv/meta similarity index 97% rename from packages/addons/driver/sundtek/meta rename to packages/addons/driver/sundtek-mediatv/meta index afeb13dab2..725a629276 100644 --- a/packages/addons/driver/sundtek/meta +++ b/packages/addons/driver/sundtek-mediatv/meta @@ -18,9 +18,9 @@ # http://www.gnu.org/copyleft/gpl.html ################################################################################ -PKG_NAME="sundtek" +PKG_NAME="sundtek-mediatv" PKG_VERSION="3.0" -PKG_REV="3" +PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="nonfree" PKG_SITE="http://support.sundtek.com/" diff --git a/packages/addons/driver/sundtek/settings-default.xml b/packages/addons/driver/sundtek-mediatv/settings-default.xml similarity index 100% rename from packages/addons/driver/sundtek/settings-default.xml rename to packages/addons/driver/sundtek-mediatv/settings-default.xml diff --git a/packages/addons/driver/sundtek/source/bin/sundtek.start b/packages/addons/driver/sundtek-mediatv/source/bin/sundtek.start similarity index 95% rename from packages/addons/driver/sundtek/source/bin/sundtek.start rename to packages/addons/driver/sundtek-mediatv/source/bin/sundtek.start index eed33185de..232caa545d 100644 --- a/packages/addons/driver/sundtek/source/bin/sundtek.start +++ b/packages/addons/driver/sundtek-mediatv/source/bin/sundtek.start @@ -22,7 +22,7 @@ . /etc/profile -ADDON_DIR="$HOME/.xbmc/addons/driver.dvb.sundtek" +ADDON_DIR="$HOME/.xbmc/addons/driver.dvb.sundtek-mediatv" logger -t Sundtek "### Sundtek manual start ###" . $ADDON_DIR/bin/userspace-driver.sh diff --git a/packages/addons/driver/sundtek/source/bin/sundtek.stop b/packages/addons/driver/sundtek-mediatv/source/bin/sundtek.stop similarity index 95% rename from packages/addons/driver/sundtek/source/bin/sundtek.stop rename to packages/addons/driver/sundtek-mediatv/source/bin/sundtek.stop index be22e253f3..dff6338175 100644 --- a/packages/addons/driver/sundtek/source/bin/sundtek.stop +++ b/packages/addons/driver/sundtek-mediatv/source/bin/sundtek.stop @@ -22,7 +22,7 @@ . /etc/profile -ADDON_DIR="$HOME/.xbmc/addons/driver.dvb.sundtek" +ADDON_DIR="$HOME/.xbmc/addons/driver.dvb.sundtek-mediatv" export LD_PRELOAD=$ADDON_DIR/lib/libmediaclient.so diff --git a/packages/addons/driver/sundtek/source/bin/userspace-driver.sh b/packages/addons/driver/sundtek-mediatv/source/bin/userspace-driver.sh similarity index 86% rename from packages/addons/driver/sundtek/source/bin/userspace-driver.sh rename to packages/addons/driver/sundtek-mediatv/source/bin/userspace-driver.sh index 40b93317f9..3b50b046a5 100644 --- a/packages/addons/driver/sundtek/source/bin/userspace-driver.sh +++ b/packages/addons/driver/sundtek-mediatv/source/bin/userspace-driver.sh @@ -32,10 +32,9 @@ net_tuner_num_fix() { echo $num } -ADDON_DIR="$HOME/.xbmc/addons/driver.dvb.sundtek" -ADDON_HOME="$HOME/.xbmc/userdata/addon_data/driver.dvb.sundtek" +ADDON_DIR="$HOME/.xbmc/addons/driver.dvb.sundtek-mediatv" +ADDON_HOME="$HOME/.xbmc/userdata/addon_data/driver.dvb.sundtek-mediatv" ADDON_SETTINGS="$ADDON_HOME/settings.xml" -SUNDTEK_READY="/var/run/sundtek.ready" mkdir -p $ADDON_HOME @@ -45,9 +44,11 @@ else # in case of missing entries in addon home's sundtek.conf entry_set="$(grep use_hwpidfilter $ADDON_HOME/sundtek.conf 2>/dev/null)" if [ -z "$entry_set" ]; then - sed -i 's|\(^device_attach=.*\)|\1\n# enable listening on network\nenablenetwork=off|g' $ADDON_HOME/sundtek.conf - sed -i 's|\(^device_attach=.*\)|\1\n\n# enable HW PID filter\nuse_hwpidfilter=off\n|g' $ADDON_HOME/sundtek.conf + sed -i 's|^device_attach=.*|# device_attach not used anymore\n\n# enable HW PID filter\nuse_hwpidfilter=off\n\n# enable listening on network\nenablenetwork=off|g' $ADDON_HOME/sundtek.conf sed -i 's|^#first_adapter=.*|first_adapter=0|g' $ADDON_HOME/sundtek.conf + + sed -i 's|.*network tuner IP address (OpenELEC specific).*||g' $ADDON_HOME/sundtek.conf + sed -i 's|.*network_tuner_ip=.*||g' $ADDON_HOME/sundtek.conf fi fi @@ -74,6 +75,10 @@ if [ "$AUTO_UPDATE" = "true" -a -f $ADDON_DIR/bin/mediasrv ]; then fi if [ ! -f $ADDON_DIR/bin/mediasrv ]; then + # remove renamed addon if exist + rm -fr "$HOME/.xbmc/addons/driver.dvb.sundtek" + rm -fr "$HOME/userdata/addon_data/driver.dvb.sundtek" + logger -t Sundtek "### Downloading installer ###" cd $ADDON_DIR mkdir -p bin lib tmp @@ -90,7 +95,7 @@ if [ ! -f $ADDON_DIR/bin/mediasrv ]; then # enable HW PID filter on RPi by default sed -i 's|^use_hwpidfilter=.*|use_hwpidfilter=on|g' $ADDON_DIR/config/sundtek.conf sed -i 's|^use_hwpidfilter=.*|use_hwpidfilter=on|g' $ADDON_HOME/sundtek.conf - sed -i 's|.*id="ENABLE_HW_PID_FILTER" value=.*||' $ADDON_SETTINGS + sed -i 's|.*id="ENABLE_HW_PID_FILTER".*||' $ADDON_SETTINGS else logger -t Sundtek "### Unsupported architecture ###" cd .. @@ -124,15 +129,18 @@ if [ ! -f $ADDON_HOME/driver-version.txt ]; then cp $ADDON_DIR/driver-version.txt $ADDON_HOME/ fi -# enable to install same addon version again -rm -f /storage/.xbmc/addons/packages/driver.dvb.sundtek-* +# enable to install same addon package version again +rm -f /storage/.xbmc/addons/packages/driver.dvb.sundtek* # add alias for /opt/bin/mediaclient alias_set="$(grep libmediaclient.so /storage/.profile 2>/dev/null)" if [ -z "$alias_set" ]; then echo "" >>/storage/.profile - echo "[ -f /storage/.xbmc/addons/driver.dvb.sundtek/lib/libmediaclient.so ] && export LD_PRELOAD=/storage/.xbmc/addons/driver.dvb.sundtek/lib/libmediaclient.so" >>/storage/.profile + echo "[ -f /storage/.xbmc/addons/driver.dvb.sundtek-mediatv/lib/libmediaclient.so ] && export LD_PRELOAD=/storage/.xbmc/addons/driver.dvb.sundtek-mediatv/lib/libmediaclient.so" >>/storage/.profile echo "" >>/storage/.profile +else + # fix name + sed -i 's|/driver.dvb.sundtek/|/driver.dvb.sundtek-mediatv/|g' /storage/.profile fi export LD_PRELOAD=$ADDON_DIR/lib/libmediaclient.so @@ -160,7 +168,6 @@ fi if [ -z "$(pidof mediasrv)" ]; then rm -f /var/log/mediasrv.log rm -f /var/log/mediaclient.log - rm -f $SUNDTEK_READY SUNDTEK_CONF_TMP=/tmp/sundtek.conf cp $ADDON_HOME/sundtek.conf $SUNDTEK_CONF_TMP @@ -247,29 +254,15 @@ if [ -z "$(pidof mediasrv)" ]; then cp $SUNDTEK_CONF_TMP $ADDON_HOME/sundtek.conf fi - #rm "$SUNDTEK_CONF_TMP" - mediasrv --wait-for-devices -p $ADDON_DIR/bin -c $ADDON_HOME/sundtek.conf -d - # wait for device to get attached or connected - for i in $(seq 1 240); do - if [ -f $SUNDTEK_READY ]; then - rm -f $SUNDTEK_READY - logger -t Sundtek "### Sundtek ready ###" - - if [ -n $SETTLE_TIME -a $SETTLE_TIME -gt 0 ]; then - logger -t Sundtek "### Settle for $SETTLE_TIME sec ###" - sleep $SETTLE_TIME - fi - - break - elif [ "$i" = "240" ]; then - logger -t Sundtek "### No Sundtek device attached or connected ###" - return - else - usleep 500000 - fi - done + # wait few seconds + [ -z "$SETTLE_TIME" ] && SETTLE_TIME=0 + SETTLE_TIME=$(( $SETTLE_TIME *1 )) + if [ $SETTLE_TIME -gt 0 ]; then + logger -t Sundtek "### Settle for $SETTLE_TIME sec ###" + sleep $SETTLE_TIME + fi if [ "$ANALOG_TV" = "true" ]; then logger -t Sundtek "### Switching to analog TV mode ###" @@ -292,3 +285,5 @@ if [ -z "$(pidof mediasrv)" ]; then fi )& fi + +logger -t Sundtek "### Sundtek ready ###" diff --git a/packages/addons/driver/sundtek/source/default.py b/packages/addons/driver/sundtek-mediatv/source/default.py similarity index 100% rename from packages/addons/driver/sundtek/source/default.py rename to packages/addons/driver/sundtek-mediatv/source/default.py diff --git a/packages/addons/driver/sundtek/source/resources/language/English/strings.xml b/packages/addons/driver/sundtek-mediatv/source/resources/language/English/strings.xml similarity index 100% rename from packages/addons/driver/sundtek/source/resources/language/English/strings.xml rename to packages/addons/driver/sundtek-mediatv/source/resources/language/English/strings.xml diff --git a/packages/addons/driver/sundtek/source/resources/settings.xml b/packages/addons/driver/sundtek-mediatv/source/resources/settings.xml similarity index 72% rename from packages/addons/driver/sundtek/source/resources/settings.xml rename to packages/addons/driver/sundtek-mediatv/source/resources/settings.xml index cd2d13eedd..6b4940cfdc 100644 --- a/packages/addons/driver/sundtek/source/resources/settings.xml +++ b/packages/addons/driver/sundtek-mediatv/source/resources/settings.xml @@ -3,13 +3,13 @@ - - - - - - - + + + + + + + diff --git a/packages/addons/driver/sundtek/source/sleep.d/sundtek.power b/packages/addons/driver/sundtek-mediatv/source/sleep.d/sundtek-mediatv.power similarity index 91% rename from packages/addons/driver/sundtek/source/sleep.d/sundtek.power rename to packages/addons/driver/sundtek-mediatv/source/sleep.d/sundtek-mediatv.power index b81f5ea9cc..967e1dee91 100644 --- a/packages/addons/driver/sundtek/source/sleep.d/sundtek.power +++ b/packages/addons/driver/sundtek-mediatv/source/sleep.d/sundtek-mediatv.power @@ -23,22 +23,22 @@ . /etc/profile LOCKDIR="/var/lock/" -LOCKFILE="sundtek" +LOCKFILE="$LOCKDIR/sundtek-mediatv" case "$1" in hibernate|suspend) if [ -n "$(pidof mediasrv)" ]; then progress "Shutting down Sundtek DVB driver for suspending..." mkdir -p "$LOCKDIR" - touch "$LOCKDIR/$LOCKFILE" + touch "$LOCKFILE" mediaclient --shutdown fi ;; thaw|resume) - if [ -f "$LOCKDIR/$LOCKFILE" ]; then + if [ -f "$LOCKFILE" ]; then # driver started within Tvheadend/VDR - rm -rf "$LOCKDIR/$LOCKFILE" + rm -f "$LOCKFILE" fi ;; diff --git a/packages/addons/driver/sundtek/source/bin/device-attached.sh b/packages/addons/driver/sundtek/source/bin/device-attached.sh deleted file mode 100644 index 9b62feb274..0000000000 --- a/packages/addons/driver/sundtek/source/bin/device-attached.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -SUNDTEK_READY="/var/run/sundtek.ready" - -touch $SUNDTEK_READY