From: Stefan Pluecken <stefan.pluecken@multimedia-labs.de>
Date: Mon, 11 Oct 2010 10:37:49 +0000 (+0200)
Subject: Merge branch 'bug_587_new_internally_connectable_and_unsupported_tuner_management... 
X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=commitdiff_plain;h=0951e9fb3386f8f941a7756910ff7162ebb98a4a

Merge branch 'bug_587_new_internally_connectable_and_unsupported_tuner_management' into experimental

Conflicts:
	lib/python/Components/NimManager.py
---

0951e9fb3386f8f941a7756910ff7162ebb98a4a
diff --cc lib/python/Components/NimManager.py
index 2ece5e6,815cfe3..7303186
--- a/lib/python/Components/NimManager.py
+++ b/lib/python/Components/NimManager.py
@@@ -481,8 -481,7 +481,7 @@@ class SecConfigure
  		self.update()
  
  class NIM(object):
- 	def __init__(self, slot, type, description, has_outputs = True, internally_connectable = None, multi_type = {}, frontend_id = None, i2c = None):
- 
 -	def __init__(self, slot, type, description, has_outputs = True, internally_connectable = None, multi_type = {}, frontend_id = None, is_empty = False):
++	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):
@@@ -494,8 -493,8 +493,9 @@@
  		self.has_outputs = has_outputs
  		self.internally_connectable = internally_connectable
  		self.multi_type = multi_type
 +		self.i2c = i2c
  		self.frontend_id = frontend_id
+ 		self.__is_empty = is_empty
  
  	def isCompatible(self, what):
  		if not self.isSupported():
@@@ -746,8 -744,7 +753,7 @@@ class NimManager
  				entry["frontend_device"] = entry["internally_connectable"] = None
  			if not (entry.has_key("multi_type")):
  				entry["multi_type"] = {}
- 			self.nim_slots.append(NIM(slot = id, description = entry["name"], type = entry["type"], has_outputs = entry["has_outputs"], internally_connectable = entry["internally_connectable"], multi_type = entry["multi_type"], frontend_id = entry["frontend_device"], i2c = entry["i2c"]))
- 
 -			self.nim_slots.append(NIM(slot = id, description = entry["name"], type = entry["type"], has_outputs = entry["has_outputs"], internally_connectable = entry["internally_connectable"], multi_type = entry["multi_type"], frontend_id = entry["frontend_device"], is_empty = entry["isempty"]))
++			self.nim_slots.append(NIM(slot = id, description = entry["name"], type = entry["type"], has_outputs = entry["has_outputs"], internally_connectable = entry["internally_connectable"], multi_type = entry["multi_type"], frontend_id = entry["frontend_device"], i2c = entry["i2c"], is_empty = entry["isempty"]))
  
  	def hasNimType(self, chktype):
  		for slot in self.nim_slots: