scan: add allocateFrontendByIndex, so ServiceScan uses a fixed frontend ID - currently hardcoded 0 in python.

3 files changed, 11 insertions, 9 deletions

diff --git a/lib/python/Components/ServiceScan.py b/lib/python/Components/ServiceScan.py
index 915a26a0..76836961 100644
--- a/lib/python/Components/ServiceScan.py
+++ b/lib/python/Components/ServiceScan.py
@@ -34,11 +34,12 @@ class ServiceScan:
 		if self.state == self.Error:
 			self.text.setText("ERROR - failed to scan (%s)!" % (self.Errors[self.errorcode]) )
 	
-	def __init__(self, progressbar, text, transponders, flags):
+	def __init__(self, progressbar, text, transponders, feid, flags):
 		self.progressbar = progressbar
 		self.text = text
 		self.scan = eComponentScan()
 		self.state = self.Idle
+		self.feid = feid
 		self.flags = flags
 		self.scanStatusChanged()
 		
@@ -74,7 +75,7 @@ class ServiceScan:
 	def execBegin(self):
 		self.scan.statusChanged.get().append(self.scanStatusChanged)
 		self.state = self.Running
-		err = self.scan.start(self.flags)
+		err = self.scan.start(self.feid, self.flags)
 		if err:
 			self.state = self.Error
 			self.errorcode = 0
diff --git a/lib/python/Screens/ScanSetup.py b/lib/python/Screens/ScanSetup.py
index 6b05cd47..2b25cce7 100644
--- a/lib/python/Screens/ScanSetup.py
+++ b/lib/python/Screens/ScanSetup.py
@@ -269,7 +269,7 @@ class ScanSetup(Screen):
 
 		if (config.scan.type.value == 1): # single sat scan
 			getInitialTransponderList(tlist, int(self.satList[config.scan.nims.value][config.scan.satselection[config.scan.nims.value].value][1]))
-		flags |= eComponentScan.scanNetworkSearch
+			flags |= eComponentScan.scanNetworkSearch
 
 		if (config.scan.type.value == 2): # multi sat scan
 			SatList = nimmanager.getSatListForNim(config.scan.nims.value)
@@ -278,14 +278,14 @@ class ScanSetup(Screen):
 				if x[1].parent.value == 0:
 					print "   " + str(x[1].parent.configPath)
 					getInitialTransponderList(tlist, x[1].parent.configPath)
-		flags |= eComponentScan.scanNetworkSearch
+			flags |= eComponentScan.scanNetworkSearch
 
 		for x in self["config"].list:
 			x[1].save()
 
-
+		feid = 0 # insert correct frontend id here (should be user-selectable)
 		# flags |= eComponentScan.scanSearchBAT
-		self.session.openWithCallback(self.keyCancel, ServiceScan, tlist, flags)
+		self.session.openWithCallback(self.keyCancel, ServiceScan, tlist, feid, flags)
 
 		#self.close()
 
@@ -304,7 +304,8 @@ class ScanSimple(Screen):
 				print "   " + str(x[1].parent.configPath)
 				getInitialTransponderList(tlist, x[1].parent.configPath)
 
-		self.session.openWithCallback(self.keyCancel, ServiceScan, tlist, eComponentScan.scanNetworkSearch)
+		feid = 0 # FIXME
+		self.session.openWithCallback(self.keyCancel, ServiceScan, tlist, feid, eComponentScan.scanNetworkSearch)
 
 	def keyCancel(self):
 		self.close()
diff --git a/lib/python/Screens/ServiceScan.py b/lib/python/Screens/ServiceScan.py
index 17b7da75..88730ee9 100644
--- a/lib/python/Screens/ServiceScan.py
+++ b/lib/python/Screens/ServiceScan.py
@@ -13,14 +13,14 @@ class ServiceScan(Screen):
 	def cancel(self):
 		self.close()
 	
-	def __init__(self, session, transponders, flags):
+	def __init__(self, session, transponders, feid, flags):
 		Screen.__init__(self, session)
 		
 		self.session.nav.stopService()
 		
 		self["scan_progress"] = ProgressBar()
 		self["scan_state"] = Label("scan state")
-		self["scan"] = CScan(self["scan_progress"], self["scan_state"], transponders, flags)
+		self["scan"] = CScan(self["scan_progress"], self["scan_state"], transponders, feid, flags)
 
 		self["actions"] = ActionMap(["OkCancelActions"], 
 			{