diff options
| author | Andreas Monzner <andreas.monzner@multimedia-labs.de> | 2008-07-19 17:00:51 +0000 |
|---|---|---|
| committer | Andreas Monzner <andreas.monzner@multimedia-labs.de> | 2008-07-19 17:00:51 +0000 |
| commit | 0855ea4ed4197c0fc6a8f8fff5820741d80c6d41 (patch) | |
| tree | a7472d5b6994739ec79174517827ff3cc9752419 /lib/python/Components/NimManager.py | |
| parent | 5fc2635967a60400e54854500332e2be21b88b79 (diff) | |
| download | enigma2-0855ea4ed4197c0fc6a8f8fff5820741d80c6d41.tar.gz enigma2-0855ea4ed4197c0fc6a8f8fff5820741d80c6d41.zip | |
now link dvb-s frontends to dvb-s2 frontends is possible
Diffstat (limited to 'lib/python/Components/NimManager.py')
| -rw-r--r-- | lib/python/Components/NimManager.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py index 350a6b14..c5a294ed 100644 --- a/lib/python/Components/NimManager.py +++ b/lib/python/Components/NimManager.py @@ -227,9 +227,11 @@ class SecConfigure: tunermask = 1 << slotid if self.equal.has_key(slotid): - tunermask |= (1 << self.equal[slotid]) + for slot in self.equal[slotid]: + tunermask |= (1 << slot) elif self.linked.has_key(slotid): - tunermask |= (1 << self.linked[slotid]) + for slot in self.linked[slotid]: + tunermask |= (1 << slot) if currLnb.lof.value == "universal_lnb": sec.setLNBLOFL(9750000) @@ -625,10 +627,8 @@ class NimManager: slots.append(self.nim_slots[slotid].internallyConnectableTo()) for type in self.nim_slots[slotid].connectableTo(): for slot in self.getNimListOfType(type, exception = slotid): - # FIXME we restrict loopthrough from dvb-s2 to dvb-s, because the c++ part can't handle it - if not (type == "DVB-S" and self.getNimType(slot)): - if self.hasOutputs(slot): - slots.append(slot) + if self.hasOutputs(slot): + slots.append(slot) # remove nims, that have a conntectedTo reference on for testnim in slots[:]: for nim in self.getNimListOfType("DVB-S", slotid): |