X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/77bb53beb46f6984e1529c4f703523c146956d0f..ab2ae6bd08a0ef13fc7462d51fc3a9ab15509b17:/lib/python/Components/Converter/ServiceInfo.py

diff --git a/lib/python/Components/Converter/ServiceInfo.py b/lib/python/Components/Converter/ServiceInfo.py
index 413aa191..e1351c56 100644
--- a/lib/python/Components/Converter/ServiceInfo.py
+++ b/lib/python/Components/Converter/ServiceInfo.py
@@ -8,8 +8,8 @@ class ServiceInfo(Converter, object):
 	IS_WIDESCREEN = 3
 	SUBSERVICES_AVAILABLE = 4
 
-	def __init__(self, type, *args, **kwargs):
-		Converter.__init__(self)
+	def __init__(self, type):
+		Converter.__init__(self, type)
 		self.type = {
 				"HasTelext": self.HAS_TELETEXT,
 				"IsMultichannel": self.IS_MULTICHANNEL,
@@ -19,11 +19,11 @@ class ServiceInfo(Converter, object):
 			}[type]
 
 		self.interesting_events = {
-				self.HAS_TELETEXT: [iPlayableService.evEnd, iPlayableService.evUpdatedInfo],
-				self.IS_MULTICHANNEL: [iPlayableService.evUpdatedInfo, iPlayableService.evEnd],
-				self.IS_CRYPTED: [iPlayableService.evUpdatedInfo, iPlayableService.evEnd],
-				self.IS_WIDESCREEN: [iPlayableService.evUpdatedEventInfo, iPlayableService.evEnd],
-				self.SUBSERVICES_AVAILABLE: [iPlayableService.evUpdatedEventInfo, iPlayableService.evEnd]
+				self.HAS_TELETEXT: [iPlayableService.evUpdatedInfo],
+				self.IS_MULTICHANNEL: [iPlayableService.evUpdatedInfo],
+				self.IS_CRYPTED: [iPlayableService.evUpdatedInfo],
+				self.IS_WIDESCREEN: [iPlayableService.evUpdatedEventInfo],
+				self.SUBSERVICES_AVAILABLE: [iPlayableService.evUpdatedEventInfo]
 			}[self.type]
 
 	def getServiceInfoValue(self, info, what):
@@ -33,6 +33,11 @@ class ServiceInfo(Converter, object):
 		return info.getInfoString(what)
 
 	def getBoolean(self):
+		if self.cache is None:
+			self.cache = self.__getBoolean()
+		return self.cache
+
+	def __getBoolean(self):
 		service = self.source.service
 		info = service and service.info()
 		if not info:
@@ -61,3 +66,7 @@ class ServiceInfo(Converter, object):
 			return subservices and subservices.getNumberOfSubservices() > 0
 
 	boolean = property(getBoolean)
+
+	def changed(self, what):
+		if what[0] != self.CHANGED_SPECIFIC or what[1] in self.interesting_events:
+			Converter.changed(self, what)