diff options
| author | Andreas Monzner <andreas.monzner@multimedia-labs.de> | 2006-05-24 09:58:11 +0000 |
|---|---|---|
| committer | Andreas Monzner <andreas.monzner@multimedia-labs.de> | 2006-05-24 09:58:11 +0000 |
| commit | f1735026cf43b48fde28af179b4ef16ce4955cc0 (patch) | |
| tree | 202fef716e0b63b37599669ca7abe290fa8dea07 /lib/python | |
| parent | c7a430797475bebdaf1e638f13bcae7b4026ee73 (diff) | |
| download | enigma2-f1735026cf43b48fde28af179b4ef16ce4955cc0.tar.gz enigma2-f1735026cf43b48fde28af179b4ef16ce4955cc0.zip | |
some fixes for dvb-s2
Diffstat (limited to 'lib/python')
| -rw-r--r-- | lib/python/Components/NimManager.py | 3 | ||||
| -rw-r--r-- | lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py | 1 | ||||
| -rw-r--r-- | lib/python/Screens/ScanSetup.py | 7 |
3 files changed, 7 insertions, 4 deletions
diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py index f3e1b7c4..679fd6b6 100644 --- a/lib/python/Components/NimManager.py +++ b/lib/python/Components/NimManager.py @@ -348,6 +348,7 @@ class NimManager: self.satList.append( (tname, tpos) ) self.parsedSat = int(tpos) elif (name == "transponder"): + system = int(attrs.get('system',"0")) freq = int(attrs.get('frequency',"")) sr = int(attrs.get('symbol_rate',"")) pol = int(attrs.get('polarization',"")) @@ -357,7 +358,7 @@ class NimManager: else: self.transponders[self.parsedSat] = [ ] - self.transponders[self.parsedSat].append((0, freq, sr, pol, fec)) + self.transponders[self.parsedSat].append((0, freq, sr, pol, fec, system)) class parseCables(ContentHandler): def __init__(self, cablesList, transponders): diff --git a/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py b/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py index f1c8da3f..67da8bb9 100644 --- a/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py +++ b/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py @@ -349,6 +349,7 @@ class Tuner: parm.fec = transponder[3] parm.inversion = transponder[4] parm.orbital_position = transponder[5] + parm.system = 0 # FIXMEE !! HARDCODED DVB-S (add support for DVB-S2) feparm = eDVBFrontendParameters() feparm.setDVBS(parm, True) self.lastparm = feparm diff --git a/lib/python/Screens/ScanSetup.py b/lib/python/Screens/ScanSetup.py index 313b0828..5d84df1a 100644 --- a/lib/python/Screens/ScanSetup.py +++ b/lib/python/Screens/ScanSetup.py @@ -83,6 +83,7 @@ def getInitialTransponderList(tlist, pos): #parm.inversion = 1 #eDVBFrontendParametersSatellite.Inversion.Off; parm.inversion = 2 #AUTO parm.orbital_position = pos + parm.system = x[5] #DVB-S or DVB-S2 tlist.append(parm) def getInitialCableTransponderList(tlist, cable): @@ -378,7 +379,7 @@ class ScanSetup(Screen): "3_5": 7, "4_5": 8, "9_10": 9, - "none": 10 + "none": 15 } def addSatTransponder(self, tlist, frequency, symbol_rate, polarisation, fec, inversion, orbital_position, system): @@ -436,8 +437,8 @@ class ScanSetup(Screen): config.scan.sat.polarization.value, fec, config.scan.sat.inversion.value, - config.scan.sat.system.value, - orbpos) + orbpos, + config.scan.sat.system.value) elif currentConfigSelectionElement(config.scan.type) == "single_satellite": sat = self.satList[config.scan.nims.value][config.scan.satselection[config.scan.nims.value].value] getInitialTransponderList(tlist, int(sat[1])) |