Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv

This commit is contained in:
Stephan Raue 2012-03-25 15:45:19 +02:00
commit cd25b81250
17 changed files with 55 additions and 10 deletions

View File

@ -18,6 +18,21 @@
# http://www.gnu.org/copyleft/gpl.html
################################################################################
import xbmc, time, os, subprocess
import os
import sys
import xbmcaddon
import time
import subprocess
import xbmc
subprocess.Popen("SABnzbd-Suite.service", shell=True, close_fds=True)
__scriptname__ = "SABnzbd Suite"
__author__ = "OpenELEC"
__url__ = "http://www.openelec.tv"
__settings__ = xbmcaddon.Addon(id='service.downloadmanager.SABnzbd-Suite')
__cwd__ = __settings__.getAddonInfo('path')
__path__ = xbmc.translatePath( os.path.join( __cwd__, 'bin', "SABnzbd-Suite.service") )
#make binary files executable in adson bin folder
subprocess.Popen("chmod -R +x " + __cwd__ + "/bin/*" , shell=True, close_fds=True)
subprocess.Popen(__path__, shell=True, close_fds=True)

View File

@ -1,4 +1,5 @@
<settings>
<setting id="WAIT_FOR_FEINIT" value="false" />
<setting id="XMLTV_LOCATION_FILE" value="" />
<setting id="XMLTV_LOCATION_WEB" value="http://" />
<setting id="XMLTV_TYPE" value="NONE" />

View File

@ -54,6 +54,14 @@ fi
TVHEADEND_ARG="-C -s -u root -g video -c $ADDON_HOME"
mkdir -p /var/config
cat "$ADDON_DIR/settings-default.xml" | awk -F\" '{print $2"=\""$4"\""}' | sed '/^=/d' > /var/config/tvheadend.conf.default
cat "$ADDON_SETTINGS" | awk -F\" '{print $2"=\""$4"\""}' | sed '/^=/d' > /var/config/tvheadend.conf
. /var/config/tvheadend.conf.default
. /var/config/tvheadend.conf
mkdir -p $ADDON_HOME
if [ ! "$(pidof $ADDON_BIN)" ]; then
# start userspace DVB driver/addon
@ -72,6 +80,10 @@ mkdir -p $ADDON_HOME
if [ -f "$LOCKDIR/$LOCKFILE" ] ; then
break
fi
if [ "$WAIT_FOR_FEINIT" == "true" ] && [ ! -e /dev/dvb/adapter*/frontend* ] ; then
sleep 1
continue
fi
$ADDON_BIN $TVHEADEND_ARG &>$LOG_FILE
done &
fi

View File

@ -10,5 +10,6 @@
<string id="1013">XMLTV Web location</string>
<string id="1020">DVB Configuration</string>
<string id="1021">Unload DVB mudules before suspend</string>
<string id="1022">Wait for frontend initialization</string>
</strings>

View File

@ -12,6 +12,7 @@
<category label="1001">
<setting label="1020" type="lsep"/>
<setting type="sep" />
<setting id="WAIT_FOR_FEINIT" type="bool" label="1022" default="false" />
<setting id="REMOVE_MODULES" type="text" label="1021" values="" default=""/>
</category>
</settings>

View File

@ -1,4 +1,5 @@
<settings>
<setting id="WAIT_FOR_FEINIT" value="false" />
<setting id="REMOVE_MODULES" value="" />
<setting id="ENABLE_DYNAMITE" value="true" />
<setting id="ENABLE_IPTV" value="false" />

View File

@ -101,6 +101,10 @@ if [ ! "$(pidof vdr.bin)" ];then
if [ -f "$LOCKDIR/$LOCKFILE" ] ; then
break
fi
if [ "$WAIT_FOR_FEINIT" == "true" ] && [ ! -e /dev/dvb/adapter*/frontend* ] ; then
sleep 1
continue
fi
LANG=en_US.UTF-8 LD_LIBRARY_PATH="$ADDON_DIR/lib:$LD_LIBRARY_PATH" vdr.bin $VDR_ARG &>$LOG_FILE
done &
fi

View File

@ -4,6 +4,7 @@
<string id="1001">Plugins</string>
<string id="1020">DVB Configuration</string>
<string id="1021">Unload DVB mudules before suspend</string>
<string id="1022">Wait for frontend initialization</string>
<string id="1030">Plugin Configuration</string>
<string id="1031">Enable plugin: iptv</string>
<string id="1032">Enable plugin: streamdev-client</string>

View File

@ -3,6 +3,7 @@
<category label="1000">
<setting label="1020" type="lsep"/>
<setting type="sep" />
<setting id="WAIT_FOR_FEINIT" type="bool" label="1022" default="false" />
<setting id="REMOVE_MODULES" type="text" label="1021" values="" default=""/>
</category>
<category label="1001">

View File

@ -2764,7 +2764,8 @@ CONFIG_LIRC_STAGING=y
CONFIG_LIRC_IGORPLUGUSB=m
# CONFIG_LIRC_IMON is not set
# CONFIG_LIRC_SASEM is not set
# CONFIG_LIRC_SERIAL is not set
CONFIG_LIRC_SERIAL=m
CONFIG_LIRC_SERIAL_TRANSMITTER=y
# CONFIG_LIRC_SIR is not set
# CONFIG_LIRC_TTUSBIR is not set
# CONFIG_LIRC_ZILOG is not set

View File

@ -2710,7 +2710,8 @@ CONFIG_LIRC_STAGING=y
CONFIG_LIRC_IGORPLUGUSB=m
# CONFIG_LIRC_IMON is not set
# CONFIG_LIRC_SASEM is not set
# CONFIG_LIRC_SERIAL is not set
CONFIG_LIRC_SERIAL=m
CONFIG_LIRC_SERIAL_TRANSMITTER=y
# CONFIG_LIRC_SIR is not set
# CONFIG_LIRC_TTUSBIR is not set
# CONFIG_LIRC_ZILOG is not set

View File

@ -2937,7 +2937,8 @@ CONFIG_LIRC_STAGING=y
CONFIG_LIRC_IGORPLUGUSB=m
# CONFIG_LIRC_IMON is not set
# CONFIG_LIRC_SASEM is not set
# CONFIG_LIRC_SERIAL is not set
CONFIG_LIRC_SERIAL=m
CONFIG_LIRC_SERIAL_TRANSMITTER=y
# CONFIG_LIRC_SIR is not set
# CONFIG_LIRC_TTUSBIR is not set
# CONFIG_LIRC_ZILOG is not set

View File

@ -2939,7 +2939,8 @@ CONFIG_LIRC_STAGING=y
CONFIG_LIRC_IGORPLUGUSB=m
# CONFIG_LIRC_IMON is not set
# CONFIG_LIRC_SASEM is not set
# CONFIG_LIRC_SERIAL is not set
CONFIG_LIRC_SERIAL=m
CONFIG_LIRC_SERIAL_TRANSMITTER=y
# CONFIG_LIRC_SIR is not set
# CONFIG_LIRC_TTUSBIR is not set
# CONFIG_LIRC_ZILOG is not set

View File

@ -2763,7 +2763,8 @@ CONFIG_LIRC_STAGING=y
CONFIG_LIRC_IGORPLUGUSB=m
# CONFIG_LIRC_IMON is not set
# CONFIG_LIRC_SASEM is not set
# CONFIG_LIRC_SERIAL is not set
CONFIG_LIRC_SERIAL=m
CONFIG_LIRC_SERIAL_TRANSMITTER=y
# CONFIG_LIRC_SIR is not set
# CONFIG_LIRC_TTUSBIR is not set
# CONFIG_LIRC_ZILOG is not set

View File

@ -2700,7 +2700,8 @@ CONFIG_LIRC_STAGING=y
CONFIG_LIRC_IGORPLUGUSB=m
# CONFIG_LIRC_IMON is not set
# CONFIG_LIRC_SASEM is not set
# CONFIG_LIRC_SERIAL is not set
CONFIG_LIRC_SERIAL=m
CONFIG_LIRC_SERIAL_TRANSMITTER=y
# CONFIG_LIRC_SIR is not set
# CONFIG_LIRC_TTUSBIR is not set
# CONFIG_LIRC_ZILOG is not set

View File

@ -2824,7 +2824,8 @@ CONFIG_LIRC_STAGING=y
CONFIG_LIRC_IGORPLUGUSB=m
# CONFIG_LIRC_IMON is not set
# CONFIG_LIRC_SASEM is not set
# CONFIG_LIRC_SERIAL is not set
CONFIG_LIRC_SERIAL=m
CONFIG_LIRC_SERIAL_TRANSMITTER=y
# CONFIG_LIRC_SIR is not set
# CONFIG_LIRC_TTUSBIR is not set
# CONFIG_LIRC_ZILOG is not set

View File

@ -2762,7 +2762,8 @@ CONFIG_LIRC_STAGING=y
CONFIG_LIRC_IGORPLUGUSB=m
# CONFIG_LIRC_IMON is not set
# CONFIG_LIRC_SASEM is not set
# CONFIG_LIRC_SERIAL is not set
CONFIG_LIRC_SERIAL=m
CONFIG_LIRC_SERIAL_TRANSMITTER=y
# CONFIG_LIRC_SIR is not set
# CONFIG_LIRC_TTUSBIR is not set
# CONFIG_LIRC_ZILOG is not set