fix get satlists for equal and linked NIMs

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

diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py
index 350a6b140d69b609b2b5beab78269d825958aa96..1b45159d6f24c84a9cb4e659735275a386538305 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 << 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):
@@ -679,40 +679,44 @@ class NimManager:
        def getSatListForNim(self, slotid):
                list = []
                if self.nim_slots[slotid].isCompatible("DVB-S"):
+                       nim = config.Nims[slotid]
                        #print "slotid:", slotid
 
                        #print "self.satellites:", self.satList[config.Nims[slotid].diseqcA.index]
                        #print "diseqcA:", config.Nims[slotid].diseqcA.value
-                       configMode = config.Nims[slotid].configMode.value
+                       configMode = nim.configMode.value
 
                        if configMode == "equal":
-                               slotid=0 #FIXME add handling for more than two tuners !!!
-                               configMode = config.Nims[slotid].configMode.value
+                               slotid = int(nim.connectedTo.value)
+                               nim = config.Nims[slotid]
+                               configMode = nim.configMode.value
+                       elif configMode == "loopthrough":
+                               slotid = self.sec.getRoot(slotid, int(nim.connectedTo.value))
+                               nim = config.Nims[slotid]
+                               configMode = nim.configMode.value
 
                        if configMode == "simple":
-                               dm = config.Nims[slotid].diseqcMode.value
+                               dm = nim.diseqcMode.value
                                if dm in ["single", "toneburst_a_b", "diseqc_a_b", "diseqc_a_b_c_d"]:
-                                       list.append(self.satList[config.Nims[slotid].diseqcA.index])
+                                       list.append(self.satList[nim.diseqcA.index])
                                if dm in ["toneburst_a_b", "diseqc_a_b", "diseqc_a_b_c_d"]:
-                                       list.append(self.satList[config.Nims[slotid].diseqcB.index])
+                                       list.append(self.satList[nim.diseqcB.index])
                                if dm == "diseqc_a_b_c_d":
-                                       list.append(self.satList[config.Nims[slotid].diseqcC.index])
-                                       list.append(self.satList[config.Nims[slotid].diseqcD.index])
+                                       list.append(self.satList[nim.diseqcC.index])
+                                       list.append(self.satList[nim.diseqcD.index])
                                if dm == "positioner":
                                        for x in self.satList:
                                                list.append(x)
                        elif configMode == "advanced":
                                for x in self.satList:
-                                       if int(config.Nims[slotid].advanced.sat[x[0]].lnb.value) != 0:
+                                       if int(nim.advanced.sat[x[0]].lnb.value) != 0:
                                                list.append(x)
-               
                return list
 
        def getRotorSatListForNim(self, slotid):
                list = []
                if self.nim_slots[slotid].isCompatible("DVB-S"):
                        #print "slotid:", slotid
-
                        #print "self.satellites:", self.satList[config.Nims[slotid].diseqcA.value]
                        #print "diseqcA:", config.Nims[slotid].diseqcA.value
                        configMode = config.Nims[slotid].configMode.value