X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/1f820106cba412af1408ba56aa9cf51657e48857..330f9198e1a85021c32a1ce9f53e5259eabc6795:/lib/python/Components/Converter/ServiceName.py

diff --git a/lib/python/Components/Converter/ServiceName.py b/lib/python/Components/Converter/ServiceName.py
index 79e0c997..fcabe427 100644
--- a/lib/python/Components/Converter/ServiceName.py
+++ b/lib/python/Components/Converter/ServiceName.py
@@ -1,14 +1,19 @@
+# -*- coding: utf-8 -*-
 from Components.Converter.Converter import Converter
-from enigma import iServiceInformation
+from enigma import iServiceInformation, iPlayableService
+from Components.Element import cached
 
 class ServiceName(Converter, object):
 	NAME = 0
 	PROVIDER = 1
+	REFERENCE = 2
 
-	def __init__(self, type, *args, **kwargs):
-		Converter.__init__(self)
+	def __init__(self, type):
+		Converter.__init__(self, type)
 		if type == "Provider":
 			self.type = self.PROVIDER
+		elif type == "Reference":
+			self.type = self.REFERENCE
 		else:
 			self.type = self.NAME
 
@@ -18,6 +23,7 @@ class ServiceName(Converter, object):
 			return "N/A"
 		return info.getInfoString(what)
 
+	@cached
 	def getText(self):
 		service = self.source.service
 		info = service and service.info()
@@ -25,8 +31,14 @@ class ServiceName(Converter, object):
 			return ""
 		
 		if self.type == self.NAME:
-			return service.getName()
+			return info.getName().replace('\xc2\x86', '').replace('\xc2\x87', '')
 		elif self.type == self.PROVIDER:
 			return self.getServiceInfoValue(info, iServiceInformation.sProvider)
-
+		elif self.type == self.REFERENCE:
+			return self.getServiceInfoValue(info, iServiceInformation.sServiceref)
+		
 	text = property(getText)
+
+	def changed(self, what):
+		if what[0] != self.CHANGED_SPECIFIC or what[1] in [iPlayableService.evStart]:
+			Converter.changed(self, what)