X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fpython%2FComponents%2FNimManager.py;h=4b7ef8eab4d1df3ecbd7e6f271a133b96075180d;hp=bd1a3638c47ba484f6c9d511f48710ac8616f7b7;hb=c97ce12d8d2cff90adefbea0864df38e370d875a;hpb=74e73fc17f163be508f19fc68ecce835be0177b9

diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py
old mode 100644
new mode 100755
index bd1a363..4b7ef8e
--- a/lib/python/Components/NimManager.py
+++ b/lib/python/Components/NimManager.py
@@ -118,8 +118,11 @@ class SecConfigure:
 
 	def linkNIMs(self, sec, nim1, nim2):
 		print "link tuner", nim1, "to tuner", nim2
-		if nim2 == (nim1 - 1):
-			self.linkInternally(nim1)
+#		if nim2 == (nim1 - 1):
+#			self.linkInternally(nim1)
+#
+# for internally connect tuner A to B
+		self.linkInternally(nim1)
 		sec.setTunerLinked(nim1, nim2)
 		
 	def getRoot(self, slotid, connto):
@@ -150,7 +153,7 @@ class SecConfigure:
 
 		for slot in nim_slots:
 			if slot.type is not None:
-				used_nim_slots.append((slot.slot, slot.description, slot.config.configMode.value != "nothing" and True or False, slot.isCompatible("DVB-S2"), slot.frontend_id is None and -1 or slot.frontend_id))
+				used_nim_slots.append((slot.slot, slot.description, slot.config.configMode.value != "nothing" and True or False, slot.isCompatible("DVB-S2"), slot.isCompatible("DVB-T2"), slot.frontend_id is None and -1 or slot.frontend_id))
 		eDVBResourceManager.getInstance().setFrontendSlotInformations(used_nim_slots)
 
 		for slot in nim_slots:
@@ -485,7 +488,7 @@ class NIM(object):
 	def __init__(self, slot, type, description, has_outputs = True, internally_connectable = None, multi_type = {}, frontend_id = None, i2c = None, is_empty = False):
 		self.slot = slot
 
-		if type not in ("DVB-S", "DVB-C", "DVB-T", "DVB-S2", None):
+		if type not in ("DVB-S", "DVB-C", "DVB-T", "DVB-S2", "DVB-T2", None):
 			print "warning: unknown NIM type %s, not using." % type
 			type = None
 
@@ -506,7 +509,8 @@ class NIM(object):
 				"DVB-S": ("DVB-S", None),
 				"DVB-C": ("DVB-C", None),
 				"DVB-T": ("DVB-T", None),
-				"DVB-S2": ("DVB-S", "DVB-S2", None)
+				"DVB-S2": ("DVB-S", "DVB-S2", None),
+				"DVB-T2": ("DVB-T", "DVB-T2", None)
 			}
 		return what in compatible[self.type]
 	
@@ -518,7 +522,8 @@ class NIM(object):
 				"DVB-S": ("DVB-S", "DVB-S2"),
 				"DVB-C": ("DVB-C",),
 				"DVB-T": ("DVB-T",),
-				"DVB-S2": ("DVB-S", "DVB-S2")
+				"DVB-S2": ("DVB-S", "DVB-S2"),
+				"DVB-T2": ("DVB-T", "DVB-T2",)
 			}
 		return connectable[self.type]
 
@@ -572,8 +577,9 @@ class NIM(object):
 		return {
 			"DVB-S": "DVB-S", 
 			"DVB-T": "DVB-T",
-			"DVB-S2": "DVB-S2",
 			"DVB-C": "DVB-C",
+			"DVB-S2": "DVB-S2",
+			"DVB-T2": "DVB-T2",
 			None: _("empty")
 			}[self.type]
 
@@ -838,6 +844,8 @@ class NimManager:
 		type = self.getNimType(slotid)
 		if type == "DVB-S2":
 			type = "DVB-S"
+		elif type == "DVB-T2":
+			type = "DVB-T"
 		nimList = self.getNimListOfType(type, slotid)
 		for nim in nimList[:]:
 			mode = self.getNimConfig(nim)
@@ -849,6 +857,8 @@ class NimManager:
 		type = self.getNimType(slotid)
 		if type == "DVB-S2":
 			type = "DVB-S"
+		elif type == "DVB-T2":
+			type = "DVB-T"
 		nimList = self.getNimListOfType(type, slotid)
 		positionerList = []
 		for nim in nimList[:]:
@@ -903,7 +913,7 @@ class NimManager:
 			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"):
+			if self.nim_slots[slotid].isCompatible("DVB-S") or self.nim_slots[slotid].isCompatible("DVB-T") or self.nim_slots[slotid].isCompatible("DVB-C") or self.nim_slots[slotid].isCompatible("DVB-T2"):
 				return not (configMode == "nothing")		
 
 	def getSatListForNim(self, slotid):
@@ -1504,6 +1514,20 @@ def InitNimManager(nimmgr):
 				n += 1
 			nim.terrestrial = ConfigSelection(choices = list)
 			nim.terrestrial_5V = ConfigOnOff()
+		elif slot.isCompatible("DVB-T2"):
+			nim.configMode = ConfigSelection(
+				choices = {
+					"enabled": _("enabled"),
+					"nothing": _("nothing connected"),
+					},
+				default = "enabled")
+			list = []
+			n = 0
+			for x in nimmgr.terrestrialsList:
+				list.append((str(n), x[0]))
+				n += 1
+			nim.terrestrial = ConfigSelection(choices = list)
+			nim.terrestrial_5V = ConfigOnOff()
 		else:
 			empty_slots += 1
 			nim.configMode = ConfigSelection(choices = { "nothing": _("disabled") }, default="nothing");