disable unicable for release 2.6

[vuplus_dvbapp] / lib / python / Components / NimManager.py

diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py
index c5b2f8d..5154e2b 100644 (file)
--- a/lib/python/Components/NimManager.py
+++ b/lib/python/Components/NimManager.py
@@ -46,7 +46,7 @@ class SecConfigure:
                if self.equal.has_key(slotid):
                        for slot in self.equal[slotid]:
                                tunermask |= (1 << slot)
-               elif self.linked.has_key(slotid):
+               if self.linked.has_key(slotid):
                        for slot in self.linked[slotid]:
                                tunermask |= (1 << slot)
                sec.setLNBSatCR(-1)
@@ -262,7 +262,7 @@ class SecConfigure:
                                if self.equal.has_key(slotid):
                                        for slot in self.equal[slotid]:
                                                tunermask |= (1 << slot)
-                               elif self.linked.has_key(slotid):
+                               if self.linked.has_key(slotid):
                                        for slot in self.linked[slotid]:
                                                tunermask |= (1 << slot)
 
@@ -759,6 +759,22 @@ class NimManager:
 
        def getSatList(self):
                return self.satList
+       
+       # returns True if something is configured to be connected to this nim
+       # if slotid == -1, returns if something is connected to ANY nim
+       def somethingConnected(self, slotid = -1):
+               if (slotid == -1):
+                       connected = False
+                       for id in range(self.getSlotCount()):
+                               if self.somethingConnected(id):
+                                       connected = True
+                       return connected
+               else:
+                       nim = config.Nims[slotid]
+                       configMode = nim.configMode.value
+               
+                       if self.nim_slots[slotid].isCompatible("DVB-S") or self.nim_slots[slotid].isCompatible("DVB-T") or self.nim_slots[slotid].isCompatible("DVB-C"):
+                               return not (configMode == "nothing")            
 
        def getSatListForNim(self, slotid):
                list = []
@@ -923,7 +939,7 @@ def InitNimManager(nimmgr):
 
        lnb_choices = {
                "universal_lnb": _("Universal LNB"),
-               "unicable": _("Unicable"),
+#              "unicable": _("Unicable"),
                "c_band": _("C-Band"),
                "user_defined": _("User defined")}