diff options
| author | Stefan Pluecken <stefan.pluecken@multimedia-labs.de> | 2006-10-10 23:07:33 +0000 |
|---|---|---|
| committer | Stefan Pluecken <stefan.pluecken@multimedia-labs.de> | 2006-10-10 23:07:33 +0000 |
| commit | da51ddf9784483ff34fc51fcf33971018b8794d2 (patch) | |
| tree | 113ad351c937358a9491d8de3f427cf7f0cbf0e5 /lib/python/Screens | |
| parent | b5ca0a1b4676eea8cf2fd9966634cac73bd46e5b (diff) | |
| download | enigma2-da51ddf9784483ff34fc51fcf33971018b8794d2.tar.gz enigma2-da51ddf9784483ff34fc51fcf33971018b8794d2.zip | |
some German translations (especially for the parental control)
improve automatic cable scan
Diffstat (limited to 'lib/python/Screens')
| -rw-r--r-- | lib/python/Screens/Satconfig.py | 2 | ||||
| -rw-r--r-- | lib/python/Screens/ScanSetup.py | 29 |
2 files changed, 23 insertions, 8 deletions
diff --git a/lib/python/Screens/Satconfig.py b/lib/python/Screens/Satconfig.py index a72d7564..d6d9904c 100644 --- a/lib/python/Screens/Satconfig.py +++ b/lib/python/Screens/Satconfig.py @@ -64,7 +64,7 @@ class NimSetup(Screen, ConfigListScreen): self.fillListWithAdvancedSatEntrys(currSat) self.have_advanced = True elif self.nim_type == nimmanager.nimType["DVB-C"]: - self.list.append(getConfigListEntry(_("Cable provider"), self.nimConfig.cable)) + self.list.append(getConfigListEntry(_("Service scan type needed"), self.nimConfig.cabletype)) self.have_advanced = False elif self.nim_type == nimmanager.nimType["DVB-T"]: self.have_advanced = False diff --git a/lib/python/Screens/ScanSetup.py b/lib/python/Screens/ScanSetup.py index 6237b50d..ea8d0b0a 100644 --- a/lib/python/Screens/ScanSetup.py +++ b/lib/python/Screens/ScanSetup.py @@ -91,15 +91,25 @@ def getInitialTransponderList(tlist, pos): def getInitialCableTransponderList(tlist, cable): list = nimmanager.getTranspondersCable(cable) + symbolrates = [6900000, 6875000] + modulations = [3, 5, 1, 2, 4] # QAM 64, 256, 16, 32, 128 + for x in list: if x[0] == 1: #CABLE - parm = eDVBFrontendParametersCable() - parm.frequency = x[1] - parm.symbol_rate = x[2] - parm.modulation = x[3] - parm.fec_inner = x[4] - parm.inversion = 2 # AUTO - tlist.append(parm) + for symbolrate in symbolrates: + for modulation in modulations: + parm = eDVBFrontendParametersCable() + parm.frequency = x[1] + parm.symbol_rate = symbolrate + parm.modulation = modulation + parm.fec_inner = 0 + parm.inversion = 2 # AUTO + #print "frequency:", x[1] + #print "symbol_rate:", x[2] + #print "modulation:", x[3] + #print "fec_inner:", x[4] + #print "inversion:", 2 + tlist.append(parm) def getInitialTerrestrialTransponderList(tlist, region): list = nimmanager.getTranspondersTerrestrial(region) @@ -613,6 +623,7 @@ class ScanSimple(ConfigListScreen, Screen): print "Scan Tuner", slotid, "-", c.value if c.value: scanPossible = False + trustNit = False tlist = [ ] if nimmanager.getNimType(slotid) == nimmanager.nimType["DVB-S"]: print "is sat" @@ -632,6 +643,8 @@ class ScanSimple(ConfigListScreen, Screen): elif nimmanager.getNimType(slotid) == nimmanager.nimType["DVB-C"]: scanPossible = True getInitialCableTransponderList(tlist, nimmanager.getCableDescription(slotid)) + if nimmanager.getCableTrustNit(slotid): + trustNit = True elif nimmanager.getNimType(slotid) == nimmanager.nimType["DVB-T"]: scanPossible = True getInitialTerrestrialTransponderList(tlist, nimmanager.getTerrestrialDescription(slotid)) @@ -640,6 +653,8 @@ class ScanSimple(ConfigListScreen, Screen): if scanPossible: flags=eComponentScan.scanNetworkSearch + if trustNit: + flags |= eComponentScan.clearToScanOnFirstNIT tmp = self.scan_clearallservices.value if tmp == "yes": flags |= eComponentScan.scanRemoveServices |