now link dvb-s frontends to dvb-s2 frontends is possible

[enigma2.git] / lib / python / Components / NimManager.py

diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py
index 350a6b140d69b609b2b5beab78269d825958aa96..c5a294edba797ebbfbc1c7a5287dbe836b04863c 100644 (file)
--- 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 << 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):
                                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)
 
                                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):
                        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):
                # remove nims, that have a conntectedTo reference on
                for testnim in slots[:]:
                        for nim in self.getNimListOfType("DVB-S", slotid):