diff options
| author | Felix Domke <tmbinc@elitedvb.net> | 2005-11-18 03:35:17 +0000 |
|---|---|---|
| committer | Felix Domke <tmbinc@elitedvb.net> | 2005-11-18 03:35:17 +0000 |
| commit | 5cdabb1038ec3f628001f26f5d587eb95ca6465d (patch) | |
| tree | c8b20083f641110d08ebff7bdc4c2ebd096a76d3 /lib/python/Screens | |
| parent | 22dd42bd9ac717c439bd339f0c85adbf3defe2b6 (diff) | |
| download | enigma2-5cdabb1038ec3f628001f26f5d587eb95ca6465d.tar.gz enigma2-5cdabb1038ec3f628001f26f5d587eb95ca6465d.zip | |
scan: add allocateFrontendByIndex, so ServiceScan uses a fixed frontend ID - currently hardcoded 0 in python.
Diffstat (limited to 'lib/python/Screens')
| -rw-r--r-- | lib/python/Screens/ScanSetup.py | 11 | ||||
| -rw-r--r-- | lib/python/Screens/ServiceScan.py | 4 |
2 files changed, 8 insertions, 7 deletions
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"], { |