Merge branch 'master' of /home/tmbinc/enigma2-git

3 files changed, 15 insertions, 9 deletions

diff --git a/lib/python/Components/TimerSanityCheck.py b/lib/python/Components/TimerSanityCheck.py
index 10dc31bd..99b2fba5 100644
--- a/lib/python/Components/TimerSanityCheck.py
+++ b/lib/python/Components/TimerSanityCheck.py
@@ -173,8 +173,7 @@ class TimerSanityCheck:
 					def getServiceType(ref): # helper function to get a service type of a service reference
 						serviceInfo = serviceHandler.info(ref)
 						serviceInfo = serviceInfo and serviceInfo.getInfoObject(ref, iServiceInformation.sTransponderData)
-						if serviceInfo:
-							return { "Satellite" : "DVB-S", "Cable" : "DVB-C", "Terrestrial" : "DVB-T"}[serviceInfo["type"]]
+						return serviceInfo and serviceInfo["tuner_type"] or ""
 
 					ref = timer.service_ref.ref
 					if ref.flags & eServiceReference.isGroup: # service group ?
diff --git a/lib/python/Components/TuneTest.py b/lib/python/Components/TuneTest.py
index 422036cd..de7b0098 100644
--- a/lib/python/Components/TuneTest.py
+++ b/lib/python/Components/TuneTest.py
@@ -3,7 +3,7 @@ from enigma import eDVBFrontendParametersSatellite, eDVBFrontendParameters, eDVB
 class Tuner:
 	def __init__(self, frontend):
 		self.frontend = frontend
-	
+
 	# transponder = (frequency, symbolrate, polarisation, fec, inversion, orbpos, system, modulation)
 	#                    0         1             2         3       4         5       6        7
 	def tune(self, transponder):
@@ -16,17 +16,25 @@ class Tuner:
 			parm.fec = transponder[3]
 			parm.inversion = transponder[4]
 			parm.orbital_position = transponder[5]
-			parm.system = 0  # FIXMEE !! HARDCODED DVB-S (add support for DVB-S2)
-			parm.modulation = 1 # FIXMEE !! HARDCODED QPSK 
+			parm.system = transponder[6]
+			parm.modulation = transponder[7]
+			parm.rolloff = transponder[8]
+			parm.pilot = transponder[9]
 			feparm = eDVBFrontendParameters()
 			feparm.setDVBS(parm)
 			self.lastparm = feparm
 			self.frontend.tune(feparm)
-	
+
 	def retune(self):
 		if self.frontend:
 			self.frontend.tune(self.lastparm)
 
+	def getTransponderData(self):
+		ret = { }
+		if self.frontend:
+			self.frontend.getTransponderData(ret, True)
+		return ret
+
 # tunes a list of transponders and checks, if they lock and optionally checks the onid/tsid combination
 # 1) add transponders with addTransponder()
 # 2) call run(<checkPIDs = True>)
diff --git a/lib/python/Components/config.py b/lib/python/Components/config.py
index 1efb8a56..a7724f40 100755
--- a/lib/python/Components/config.py
+++ b/lib/python/Components/config.py
@@ -183,9 +183,8 @@ class ConfigSelection(ConfigElement):
 			default = self.choices[0]
 
 		assert default in self.choices, "default must be in choice list, but " + repr(default) + " is not!"
-		for x in self.choices:
-			assert isinstance(x, str), "ConfigSelection choices must be strings"
-		
+#		for x in self.choices:
+#			assert isinstance(x, str), "ConfigSelection choices must be strings"
 		self.default = default
 
 		if self.value == None or not self.value in self.choices: