X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/38ff0ca06ff4cdf7ff7d94211f4be533c53dcc83..f7c13b8fcc4373f972387a0e7928658b818392b9:/lib/python/Components/NimManager.py

diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py
index f04d076d..f6362545 100644
--- a/lib/python/Components/NimManager.py
+++ b/lib/python/Components/NimManager.py
@@ -99,10 +99,11 @@ class nimSlot:
 
 class NimManager:
 	class parseSats(ContentHandler):
-		def __init__(self, satList, satellites):
+		def __init__(self, satList, satellites, transponders):
 			self.isPointsElement, self.isReboundsElement = 0, 0
 			self.satList = satList
 			self.satellites = satellites
+			self.transponders = transponders
 	
 		def startElement(self, name, attrs):
 			if (name == "sat"):
@@ -111,6 +112,21 @@ class NimManager:
 				tname = attrs.get('name',"")
 				self.satellites[tpos] = tname
 				self.satList.append( (tname, tpos) )
+				self.parsedSat = int(tpos)
+			elif (name == "transponder"):
+				freq = int(attrs.get('frequency',""))
+				sr = int(attrs.get('symbol_rate',""))
+				pol = int(attrs.get('polarization',""))
+				fec = int(attrs.get('fec_inner',""))
+				if self.parsedSat in self.transponders:
+					pass
+				else:
+					self.transponders[self.parsedSat] = [ ]
+
+				self.transponders[self.parsedSat].append((0, freq, sr, pol, fec))
+
+	def getTransponders(self, pos):
+		return self.transponders[pos]
 
 	def getConfiguredSats(self):
 		return self.sec.getSatList()
@@ -120,10 +136,11 @@ class NimManager:
 
 	def readSatsfromFile(self):
 		self.satellites = { }
+		self.transponders = { }
 
 		print "Reading satellites.xml"
 		parser = make_parser()
-		satHandler = self.parseSats(self.satList, self.satellites)
+		satHandler = self.parseSats(self.satList, self.satellites, self.transponders)
 		parser.setContentHandler(satHandler)
 		parser.parse('/etc/tuxbox/satellites.xml')
 
@@ -132,7 +149,14 @@ class NimManager:
 		nimfile = tryOpen("/proc/bus/nim_sockets")
 
 		if nimfile == "":
-			return self.nimType["empty/unknown"]
+			# FIXME: remove this in the final version
+			# check if we have a device for 7020 comp?atibility reasons
+			try:
+				open("/dev/dvb/card0/frontend" + str(slotID))
+				return self.nimType["DVB-S"]
+			except IOError:
+				return self.nimType["empty/unknown"]
+
 
 		while 1:		
 			line = nimfile.readline()
@@ -152,13 +176,6 @@ class NimManager:
 						break	
 		nimfile.close()
 		return self.nimType["empty/unknown"]
-		
-		if slotID == 0:
-			return self.nimType["DVB-S"]
-		elif slotID == 1:
-			return self.nimType["DVB-S"]
-		else:
-			return self.nimType["empty/unknown"]
 
 	def getNimName(self, slotID):
 		#FIXME get it from /proc
@@ -180,7 +197,7 @@ class NimManager:
 		self.satList = [ ]										
 												
 		self.readSatsfromFile()										
-												
+		
 		self.nimCount = self.getNimSocketCount()
 		
 		self.nimslots = [ ]
@@ -207,17 +224,19 @@ class NimManager:
 		return list
 	
 	def getSatListForNim(self, slotid):
-		#print "slotid:", slotid
 		list = []
-		#print "self.satellites:", self.satList[config.Nims[slotid].diseqcA.value]
-		#print "diseqcA:", config.Nims[slotid].diseqcA.value
-		if (config.Nims[slotid].diseqcMode.value <= 3):
-			list.append(self.satList[config.Nims[slotid].diseqcA.value])
-		if (0 < config.Nims[slotid].diseqcMode.value <= 3):
-			list.append(self.satList[config.Nims[slotid].diseqcB.value])
-		if (config.Nims[slotid].diseqcMode.value == 3):
-			list.append(self.satList[config.Nims[slotid].diseqcC.value])
-			list.append(self.satList[config.Nims[slotid].diseqcD.value])
+		if (self.getNimType(slotid) != self.nimType["empty/unknown"]):
+			#print "slotid:", slotid
+			
+			#print "self.satellites:", self.satList[config.Nims[slotid].diseqcA.value]
+			#print "diseqcA:", config.Nims[slotid].diseqcA.value
+			if (config.Nims[slotid].diseqcMode.value <= 3):
+				list.append(self.satList[config.Nims[slotid].diseqcA.value])
+			if (0 < config.Nims[slotid].diseqcMode.value <= 3):
+				list.append(self.satList[config.Nims[slotid].diseqcB.value])
+			if (config.Nims[slotid].diseqcMode.value == 3):
+				list.append(self.satList[config.Nims[slotid].diseqcC.value])
+				list.append(self.satList[config.Nims[slotid].diseqcD.value])
 		return list
 
 	#callbacks for c++ config