X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/139ac47d708f47aed50c8863193c109739bfa93e..636070f4e47caf18e752b59485758e0f4eb19492:/lib/python/Screens/ScanSetup.py

diff --git a/lib/python/Screens/ScanSetup.py b/lib/python/Screens/ScanSetup.py
index 4b2f309d..2a8c3df7 100644
--- a/lib/python/Screens/ScanSetup.py
+++ b/lib/python/Screens/ScanSetup.py
@@ -1,9 +1,9 @@
 from Screen import Screen
-from ServiceScan import *
+from ServiceScan import ServiceScan
 from Components.config import config, ConfigSubsection, ConfigSelection, \
-	ConfigYesNo, ConfigInteger, getConfigListEntry, ConfigSlider, ConfigSatlist, ConfigEnableDisable
-from Components.ActionMap import NumberActionMap
-from Components.ConfigList import ConfigList, ConfigListScreen
+	ConfigYesNo, ConfigInteger, getConfigListEntry, ConfigSlider, ConfigEnableDisable
+from Components.ActionMap import NumberActionMap, ActionMap
+from Components.ConfigList import ConfigListScreen
 from Components.NimManager import nimmanager, getConfigSatlist
 from Components.Label import Label
 from Screens.MessageBox import MessageBox
@@ -205,9 +205,10 @@ class CableTransponderSearchSupport:
 		self.cable_search_container.dataAvail.get().append(self.getCableTransponderData)
 		cableConfig = config.Nims[nim_idx].cable
 		cmd = "tda1002x --init --scan --verbose --wakeup --inv 2 --bus "
+		#FIXMEEEEEE hardcoded i2c devices for dm7025 and dm8000
 		if nim_idx < 2:
 			cmd += str(nim_idx)
-		else: # FIXMEE DM8000
+		else:
 			if nim_idx == 2:
 				cmd += "2" # first nim socket on DM8000 use /dev/i2c/2
 			else:
@@ -276,6 +277,7 @@ class ScanSetup(ConfigListScreen, Screen, CableTransponderSearchSupport):
 	def __init__(self, session):
 		Screen.__init__(self, session)
 
+		self.finished_cb = None
 		self.updateSatList()
 		self.service = session.nav.getCurrentService()
 		self.feinfo = None
@@ -305,7 +307,8 @@ class ScanSetup(ConfigListScreen, Screen, CableTransponderSearchSupport):
 
 		self["introduction"] = Label(_("Press OK to start the scan"))
 
-	def run(self):
+	def runAsync(self, finished_cb):
+		self.finished_cb = finished_cb
 		self.keyGo()
 
 	def updateSatList(self):
@@ -384,7 +387,7 @@ class ScanSetup(ConfigListScreen, Screen, CableTransponderSearchSupport):
 		elif nim.isCompatible("DVB-C"):
 			if self.scan_typecable.value == "single_transponder":
 				self.list.append(getConfigListEntry(_("Frequency"), self.scan_cab.frequency))
-				self.list.append(getConfigListEntry(_("Inversions"), self.scan_cab.inversion))
+				self.list.append(getConfigListEntry(_("Inversion"), self.scan_cab.inversion))
 				self.list.append(getConfigListEntry(_("Symbol Rate"), self.scan_cab.symbolrate))
 				self.list.append(getConfigListEntry(_("Modulation"), self.scan_cab.modulation))
 				self.list.append(getConfigListEntry(_("FEC"), self.scan_cab.fec))
@@ -734,9 +737,15 @@ class ScanSetup(ConfigListScreen, Screen, CableTransponderSearchSupport):
 	def startScan(self, tlist, flags, feid):
 		if len(tlist):
 			# flags |= eComponentScan.scanSearchBAT
-			self.session.open(ServiceScan, [{"transponders": tlist, "feid": feid, "flags": flags}])
+			if self.finished_cb:
+				self.session.openWithCallback(self.finished_cb, ServiceScan, [{"transponders": tlist, "feid": feid, "flags": flags}])
+			else:
+				self.session.open(ServiceScan, [{"transponders": tlist, "feid": feid, "flags": flags}])
 		else:
-			self.session.open(MessageBox, _("Nothing to scan!\nPlease setup your tuner settings before you start a service scan."), MessageBox.TYPE_ERROR)
+			if self.finished_cb:
+				self.session.openWithCallback(self.finished_cb, MessageBox, _("Nothing to scan!\nPlease setup your tuner settings before you start a service scan."), MessageBox.TYPE_ERROR)
+			else:
+				self.session.open(MessageBox, _("Nothing to scan!\nPlease setup your tuner settings before you start a service scan."), MessageBox.TYPE_ERROR)
 
 	def keyCancel(self):
 		for x in self["config"].list:
@@ -780,6 +789,7 @@ class ScanSimple(ConfigListScreen, Screen, CableTransponderSearchSupport):
 
 		known_networks = [ ]
 		nims_to_scan = [ ]
+		self.finished_cb = None
 
 		for nim in nimmanager.nim_slots:
 			# collect networks provided by this tuner
@@ -818,7 +828,8 @@ class ScanSimple(ConfigListScreen, Screen, CableTransponderSearchSupport):
 		self["header"] = Label(_("Automatic Scan"))
 		self["footer"] = Label(_("Press OK to scan"))
 
-	def run(self):
+	def runAsync(self, finished_cb):
+		self.finished_cb = finished_cb
 		self.keyGo()
 
 	def keyGo(self):
@@ -828,7 +839,6 @@ class ScanSimple(ConfigListScreen, Screen, CableTransponderSearchSupport):
 		self.buildTransponderList()
 
 	def buildTransponderList(self): # this method is called multiple times because of asynchronous stuff
-		print "buildTransponderList"
 		APPEND_NOW = 0
 		SEARCH_CABLE_TRANSPONDERS = 1
 		action = APPEND_NOW
@@ -885,9 +895,15 @@ class ScanSimple(ConfigListScreen, Screen, CableTransponderSearchSupport):
 
 	def startScan(self, scanList):
 		if len(scanList):
-			self.session.open(ServiceScan, scanList = scanList)
+			if self.finished_cb:
+				self.session.openWithCallback(self.finished_cb, ServiceScan, scanList = scanList)
+			else:
+				self.session.open(ServiceScan, scanList = scanList)
 		else:
-			self.session.open(MessageBox, _("Nothing to scan!\nPlease setup your tuner settings before you start a service scan."), MessageBox.TYPE_ERROR)
+			if self.finished_cb:
+				self.session.openWithCallback(self.finished_cb, MessageBox, _("Nothing to scan!\nPlease setup your tuner settings before you start a service scan."), MessageBox.TYPE_ERROR)
+			else:
+				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})