Merge pull request #1933 from vpeter4/sundtek

sundtek-mediatv: bump version

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)

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

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/"

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

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
 

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=.*|<setting id="ENABLE_HW_PID_FILTER" value="true" />|' $ADDON_SETTINGS
+    sed -i 's|.*id="ENABLE_HW_PID_FILTER".*|<setting id="ENABLE_HW_PID_FILTER" value="true" />|' $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 ###"

packages/addons/driver/sundtek-mediatv/source/resources/settings.xml

@@ -3,13 +3,13 @@
   <category label="1000" >
     <setting label="" type="lsep" />
     <setting type="sep" />
-    <setting id="AUTO_UPDATE" type="bool" label="1011" default="false" />
-    <setting id="ANALOG_TV" type="bool" label="1012" default="false" enable="false" />
-    <setting id="SETTLE_TIME" type="number" label="1014" default="0" />
-    <setting id="RUN_USER_SCRIPT" type="bool" label="1015" default="false" />
-    <setting id="ENABLE_HW_PID_FILTER" type="bool" label="1030" default="false" />
-    <setting id="ENABLE_IR_RECEIVER" type="bool" label="1035" default="false" />
-    <setting id="LOWEST_ADAPTER_NUM" type="number" label="1040" default="0" />
+    <setting id="AUTO_UPDATE"          type="bool"   label="1011" default="false" />
+    <setting id="ANALOG_TV"            type="bool"   label="1012" default="false" enable="false" />
+    <setting id="SETTLE_TIME"          type="number" label="1014" default="0" />
+    <setting id="RUN_USER_SCRIPT"      type="bool"   label="1015" default="false" />
+    <setting id="ENABLE_HW_PID_FILTER" type="bool"   label="1030" default="false" />
+    <setting id="ENABLE_IR_RECEIVER"   type="bool"   label="1035" default="false" />
+    <setting id="LOWEST_ADAPTER_NUM"   type="number" label="1040" default="0" />
   </category>
   <category label="2000" >
     <setting label="" type="lsep" />

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
     ;;
 

packages/addons/driver/sundtek/source/bin/device-attached.sh

@@ -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