Merge pull request #3298 from stefansaraev/slidercontrol

vdr/tvheadend: use slider control in settings gui
This commit is contained in:
Stefan Saraev 2014-06-05 20:14:42 +03:00
commit fd00ad9503
4 changed files with 3 additions and 13 deletions

View File

@ -72,11 +72,6 @@ for driver_dvb in $(find /storage/.xbmc/addons/driver.dvb.*/bin/userspace-driver
. $driver_dvb
done
# (wait for) at least 1 adapter (xbmc allows to set 0)
# xbmc allows "numeric" type field to be empty. lets handle thaat
[ "$NUM_ADAPTERS" = "" ] && NUM_ADAPTERS=1
# 0 does not make sense. should be 1 or more
[ $NUM_ADAPTERS -lt 1 ] && NUM_ADAPTERS=1
if [ "$WAIT_FOR_FEINIT" == "true" ] ; then
while [ true ] ; do
if [ -e /dev/dvb/adapter$((NUM_ADAPTERS-1))/frontend0 ] ; then

View File

@ -14,7 +14,7 @@
<setting label="1020" type="lsep"/>
<setting type="sep" />
<setting id="WAIT_FOR_FEINIT" type="bool" label="1022" default="false" />
<setting id="NUM_ADAPTERS" type="number" label="1023" default="1" enable="eq(-1,true)" />
<setting id="NUM_ADAPTERS" type="slider" range="1,16" option="int" label="1023" default="1" enable="eq(-1,true)" />
<setting id="REMOVE_MODULES" type="text" label="1021" values="" default=""/>
<setting id="PRELOAD_CAPMT_CA" type="bool" label="1024" default="false" />
</category>

View File

@ -154,11 +154,6 @@ for driver_dvb in $(find /storage/.xbmc/addons/driver.dvb.*/bin/userspace-driver
. $driver_dvb
done
# (wait for) at least 1 adapter (xbmc allows to set 0)
# xbmc allows "numeric" type field to be empty. lets handle thaat
[ "$NUM_ADAPTERS" = "" ] && NUM_ADAPTERS=1
# 0 does not make sense. should be 1 or more
[ $NUM_ADAPTERS -lt 1 ] && NUM_ADAPTERS=1
if [ "$WAIT_FOR_FEINIT" == "true" ] ; then
while [ true ] ; do
if [ -e /dev/dvb/adapter$((NUM_ADAPTERS-1))/frontend0 ] ; then

View File

@ -4,7 +4,7 @@
<setting label="1020" type="lsep"/>
<setting type="sep" />
<setting id="WAIT_FOR_FEINIT" type="bool" label="1022" default="false" />
<setting id="NUM_ADAPTERS" type="number" label="1023" default="1" enable="eq(-1,true)" />
<setting id="NUM_ADAPTERS" type="slider" range="1,16" option="int" label="1023" default="1" enable="eq(-1,true)" />
<setting id="REMOVE_MODULES" type="text" label="1021" values="" default=""/>
<setting id="ENABLE_CHARSET_OVERRIDE" type="bool" label="1024" default="false" />
<setting id="CHARSET_OVERRIDE_STR" type="text" label="1025" visible="!eq(-1,false)" default="" />
@ -22,7 +22,7 @@
<setting type="sep" />
<setting id="PVR_PLUGIN" type="labelenum" label="1053" values="xvdr|vnsiserver" default="vnsiserver" />
<setting id="ENABLE_IPTV" type="bool" label="1031" default="false" />
<setting id="IPTV_NUM_DEVICES" type="labelenum" label="1058" values="1|2|3|4" visible="!eq(-1,false)" default="1" />
<setting id="IPTV_NUM_DEVICES" type="slider" option="int" range="1,4" label="1058" visible="!eq(-1,false)" default="1" />
<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_LIVE" type="bool" label="1038" default="false" />