X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/98c7a787df63a93f868548c2b1e357c0d873ebbe..ee3d11136fecd16e62fae077a49f41381fa4e358:/lib/python/Screens/ScanSetup.py

diff --git a/lib/python/Screens/ScanSetup.py b/lib/python/Screens/ScanSetup.py
index f4828088..ceaaf4bb 100644
--- a/lib/python/Screens/ScanSetup.py
+++ b/lib/python/Screens/ScanSetup.py
@@ -107,6 +107,7 @@ class CableTransponderSearchSupport:
 			if raw_channel:
 				frontend = raw_channel.getFrontend()
 				if frontend:
+					frontend.closeFrontend() # immediate close... 
 					del frontend
 					del raw_channel
 					return True
@@ -117,10 +118,14 @@ class CableTransponderSearchSupport:
 		self.resetTimeout()
 		self.cable_search_container.appClosed.remove(self.cableTransponderSearchClosed)
 		self.cable_search_container.dataAvail.remove(self.getCableTransponderData)
+		if val and len(val):
+			if val[0]:
+				self.setCableTransponderSearchResult(self.__tlist)
+			else:
+				self.cable_search_container.sendCtrlC()
+				self.setCableTransponderSearchResult(None)
 		self.cable_search_container = None
 		self.cable_search_session = None
-		if val and len(val) and val[0]:
-			self.setCableTransponderSearchResult(self.__tlist)
 		self.__tlist = None
 		self.cableTransponderSearchFinished()
 
@@ -156,13 +161,13 @@ class CableTransponderSearchSupport:
 				parm.modulation = qam[data[4]]
 				parm.inversion = inv[data[5]]
 				self.__tlist.append(parm)
-		tmpstr = _("Try to find used Transponders in cable network.. please wait...")
-		tmpstr += "\n\n"
-		tmpstr += data[1]
-		tmpstr += " kHz "
-		tmpstr += data[0]
-		self.cable_search_session["text"].setText(tmpstr)
-		
+			tmpstr = _("Try to find used Transponders in cable network.. please wait...")
+			tmpstr += "\n\n"
+			tmpstr += data[1]
+			tmpstr += " kHz "
+			tmpstr += data[0]
+			self.cable_search_session["text"].setText(tmpstr)
+
 	def setTimeout(self):
 		try:
 			self.oldtimeoutvalue = open("/sys/module/dvb_core/parameters/dvb_shutdown_timeout", "r").readline()
@@ -192,21 +197,16 @@ class CableTransponderSearchSupport:
 		self.cable_search_container.dataAvail.append(self.getCableTransponderData)
 		cableConfig = config.Nims[nim_idx].cable
 		tunername = nimmanager.getNimName(nim_idx)
+		bus = nimmanager.getI2CDevice(nim_idx)
+		if bus is None:
+			print "ERROR: could not get I2C device for nim", nim_idx, "for cable transponder search"
+			bus = 2
+
 		if tunername == "CXD1981":
-			cmd = "cxd1978 --init --scan --verbose --wakeup --inv 2 --bus "
-		else:
-			cmd = "tda1002x --init --scan --verbose --wakeup --inv 2 --bus "
-		#FIXMEEEEEE hardcoded i2c devices for dm7025 and dm8000
-		if nim_idx < 2:
-			if HardwareInfo().get_device_name() == "dm500hd":
-				cmd += "2"
-			else:
-				cmd += str(nim_idx)
+			cmd = "cxd1978 --init --scan --verbose --wakeup --inv 2 --bus %d" % bus
 		else:
-			if nim_idx == 2:
-				cmd += "2" # first nim socket on DM8000 use /dev/i2c/2
-			else:
-				cmd += "4" # second nim socket on DM8000 use /dev/i2c/4
+			cmd = "tda1002x --init --scan --verbose --wakeup --inv 2 --bus %d" % bus
+		
 		if cableConfig.scan_type.value == "bands":
 			cmd += " --scan-bands "
 			bands = 0
@@ -850,7 +850,10 @@ class ScanSetup(ConfigListScreen, Screen, CableTransponderSearchSupport):
 		self.tlist = tlist
 
 	def cableTransponderSearchFinished(self):
-		self.startScan(self.tlist, self.flags, self.feid)
+		if self.tlist is None:
+			self.tlist = []
+		else:
+			self.startScan(self.tlist, self.flags, self.feid)
 
 	def startScan(self, tlist, flags, feid):
 		if len(tlist):
@@ -1016,7 +1019,8 @@ class ScanSimple(ConfigListScreen, Screen, CableTransponderSearchSupport):
 				self.session.open(MessageBox, _("Nothing to scan!\nPlease setup your tuner settings before you start a service scan."), MessageBox.TYPE_ERROR)
 
 	def setCableTransponderSearchResult(self, tlist):
-		self.scanList.append({"transponders": tlist, "feid": self.feid, "flags": self.flags})
+		if tlist is not None:
+			self.scanList.append({"transponders": tlist, "feid": self.feid, "flags": self.flags})
 
 	def cableTransponderSearchFinished(self):
 		self.buildTransponderList()