aboutsummaryrefslogtreecommitdiff
path: root/lib/python
diff options
context:
space:
mode:
authorAndreas Monzner <andreas.monzner@multimedia-labs.de>2005-12-17 12:58:46 +0000
committerAndreas Monzner <andreas.monzner@multimedia-labs.de>2005-12-17 12:58:46 +0000
commitde62aa9ce9d8b1ff8ffe12b334e68802c120e35b (patch)
treef3c8295ddf21c28b71ce9bfd080c4d9a177dc48d /lib/python
parent2601ee77efe1f10be7cbeb8af94e2fb229cc1ec1 (diff)
downloadenigma2-de62aa9ce9d8b1ff8ffe12b334e68802c120e35b.tar.gz
enigma2-de62aa9ce9d8b1ff8ffe12b334e68802c120e35b.zip
use fec from satellites.xml,
small work on scan
Diffstat (limited to 'lib/python')
-rw-r--r--lib/python/Components/NimManager.py4
-rw-r--r--lib/python/Screens/ScanSetup.py6
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py
index 38047cbd..933ebcf7 100644
--- a/lib/python/Components/NimManager.py
+++ b/lib/python/Components/NimManager.py
@@ -166,7 +166,7 @@ class NimManager:
else:
self.transponders[self.parsedCab] = [ ]
- self.transponders[self.parsedCab].append((0, freq, sr, mod, fec))
+ self.transponders[self.parsedCab].append((1, freq, sr, mod, fec))
class parseTerrestrials(ContentHandler):
def __init__(self, terrestrialsList, transponders):
@@ -197,7 +197,7 @@ class NimManager:
else:
self.transponders[self.parsedTer] = [ ]
- self.transponders[self.parsedTer].append((0, freq, bw, const, crh, crl, guard, transm, hierarchy, inv))
+ self.transponders[self.parsedTer].append((2, freq, bw, const, crh, crl, guard, transm, hierarchy, inv))
def getTransponders(self, pos):
return self.transponders[pos]
diff --git a/lib/python/Screens/ScanSetup.py b/lib/python/Screens/ScanSetup.py
index 72340780..74238f13 100644
--- a/lib/python/Screens/ScanSetup.py
+++ b/lib/python/Screens/ScanSetup.py
@@ -19,8 +19,8 @@ def getInitialTransponderList(tlist, pos):
parm.frequency = x[1]
parm.symbol_rate = x[2]
parm.polarisation = x[3] # eDVBFrontendParametersSatellite.Polarisation.Vertical
- #parm.fec = x[4] # eDVBFrontendParametersSatellite.FEC.f3_4;
- parm.fec = 6 # AUTO
+ parm.fec = x[4] # eDVBFrontendParametersSatellite.FEC.f3_4;
+ #parm.fec = 6 # AUTO
#parm.inversion = 1 #eDVBFrontendParametersSatellite.Inversion.Off;
parm.inversion = 2 #AUTO
parm.orbital_position = pos
@@ -170,7 +170,7 @@ class ScanSetup(Screen):
config.scan.sat.inversion = configElement_nonSave("config.scan.sat.inversion", configSelection, 2, (_("off"), _("on"), _("Auto")))
config.scan.sat.symbolrate = configElement_nonSave("config.scan.sat.symbolrate", configSequence, [27500], configsequencearg.get("INTEGER", (1, 99999)))
config.scan.sat.polarization = configElement_nonSave("config.scan.sat.polarization", configSelection, 0, (_("horizontal"), _("vertical"), _("circular left"), _("circular right")))
- config.scan.sat.fec = configElement_nonSave("config.scan.sat.fec", configSelection, 7, ("None", "1/2", "2/3", "3/4", "5/6", "7/8", "auto"))
+ config.scan.sat.fec = configElement_nonSave("config.scan.sat.fec", configSelection, 7, (_("Auto"), "1/2", "2/3", "3/4", "5/6", "7/8", _("None")))
# cable
config.scan.cab.frequency = configElement_nonSave("config.scan.cab.frequency", configSequence, [466], configsequencearg.get("INTEGER", (50, 9999)))