fix tunerlist, force both tuners as available

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

diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py
index d0f8536..8bbe281 100644 (file)
--- a/lib/python/Components/NimManager.py
+++ b/lib/python/Components/NimManager.py
@@ -39,9 +39,14 @@ class SecConfigure:
                sec.setCommittedCommand(diseqcpos)
                #print "set orbpos to:" + str(orbpos)
                sec.addSatellite(orbpos)
+               self.satList.append(orbpos)
+
+       def getSatList(self):
+               return self.satList
 
        def update(self):
                eDVBSatelliteEquipmentControl.getInstance().clear()
+               self.satList = []
 
                for slot in self.NimManager.nimslots:
                        x = slot.slotid
@@ -100,6 +105,12 @@ class NimManager:
                                self.satellites[tpos] = tname
                                self.satList.append( (tname, tpos) )
 
+       def getConfiguredSats(self):
+               return self.sec.getSatList()
+
+       def getSatDescription(self, pos):
+               return self.satellites[str(pos)]
+
        def readSatsfromFile(self):
                self.satellites = { }
 
@@ -113,6 +124,8 @@ class NimManager:
                #FIXME get it from /proc
                if slotID == 0:
                        return self.nimType["DVB-S"]
+               elif slotID == 1:
+                       return self.nimType["DVB-S"]
                else:
                        return self.nimType["empty/unknown"]
 
@@ -184,9 +197,10 @@ class NimManager:
                #print "nimDiseqcModeChanged set to " + str(mode)
                pass
        def nimPortAChanged(self, slotid, val):
-               #print "nimDiseqcA set to " + str(val)
+               #print "nimDiseqcA set to " + str(slotid) + " val:" + str(val)
                pass
        def nimPortBChanged(self, slotid, val):
+               #print "nimDiseqcA set to " + str(slotid) + " val:" + str(val)
                #print "nimDiseqcB set to " + str(val)
                pass
        def nimPortCChanged(self, slotid, val):
@@ -198,8 +212,10 @@ class NimManager:
 
 
 def InitNimManager(nimmgr):
-       config.Nims = [ConfigSubsection()] * nimmgr.nimCount
-
+       config.Nims = []
+       for x in range(nimmgr.nimCount):
+               config.Nims.append(ConfigSubsection())
+               
        def nimConfigModeChanged(slotid, configElement):
                nimmgr.nimConfigModeChanged(slotid, configElement.value)
        def nimDiseqcModeChanged(slotid, configElement):
@@ -232,13 +248,13 @@ def InitNimManager(nimmgr):
                        #perhaps the instance of the slot is more useful?
                        nim.configMode.addNotifier(boundFunction(nimConfigModeChanged,x))
                        nim.diseqcMode.addNotifier(boundFunction(nimDiseqcModeChanged,x))
-                       nim.diseqcA.addNotifier(boundFunction(nimPortAChanged,x))
+                       nim.diseqcA.addNotifier(boundFunction(nimPortAChanged,int(x)))
                        nim.diseqcB.addNotifier(boundFunction(nimPortBChanged,x))
                        nim.diseqcC.addNotifier(boundFunction(nimPortCChanged,x))
                        nim.diseqcD.addNotifier(boundFunction(nimPortDChanged,x))
                else:
                        print "pls add support for this frontend type!"         
-                       
+
        nimmgr.sec = SecConfigure(nimmgr)
 
 nimmanager = NimManager()