X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/90e5883ba2ab4147b8a62b545fd8d862c6058314..5e0d91a196bfe872d04d676e5f6c2d5940786be0:/lib/python/Components/Converter/ServicePosition.py

diff --git a/lib/python/Components/Converter/ServicePosition.py b/lib/python/Components/Converter/ServicePosition.py
index 87169333..089ca6c1 100644
--- a/lib/python/Components/Converter/ServicePosition.py
+++ b/lib/python/Components/Converter/ServicePosition.py
@@ -1,32 +1,40 @@
 from Converter import Converter
 from Poll import Poll
 from enigma import iPlayableService
+from Components.Element import cached
 
 class ServicePosition(Converter, Poll, object):
-	TYPE_LENGTH = 0,
-	TYPE_POSITION = 1,
-	TYPE_REMAINING = 2,
+	TYPE_LENGTH = 0
+	TYPE_POSITION = 1
+	TYPE_REMAINING = 2
 	TYPE_GAUGE = 3
-	
-	def __init__(self, type, *args, **kwargs):
+	TYPE_POSITION_DETAILED = 4
+
+	def __init__(self, type):
 		Poll.__init__(self)
-		Converter.__init__(self)
+		Converter.__init__(self, type)
+
+		self.poll_interval = 500
+
 		if type == "Length":
 			self.type = self.TYPE_LENGTH
 		elif type == "Position":
 			self.type = self.TYPE_POSITION
+		elif type == "PositionDetailed":
+			self.type = self.TYPE_POSITION_DETAILED
+			self.poll_interval = 100
 		elif type == "Remaining":
 			self.type = self.TYPE_REMAINING
 		elif type == "Gauge":
 			self.type = self.TYPE_GAUGE
 
-		self.poll_interval = 500
 		self.poll_enabled = self.type != self.TYPE_LENGTH
-	
+
 	def getSeek(self):
 		s = self.source.service
 		return s and s.seek()
-	
+
+	@cached
 	def getPosition(self):
 		seek = self.getSeek()
 		if seek is None:
@@ -35,7 +43,8 @@ class ServicePosition(Converter, Poll, object):
 		if pos[0]:
 			return 0
 		return pos[1]
-	
+
+	@cached
 	def getLength(self):
 		seek = self.getSeek()
 		if seek is None:
@@ -44,12 +53,14 @@ class ServicePosition(Converter, Poll, object):
 		if length[0]:
 			return 0
 		return length[1]
-	
+
+	@cached
 	def getCutlist(self):
 		service = self.source.service
 		cue = service and service.cueSheet()
 		return cue and cue.getCutList()
-	
+
+	@cached
 	def getText(self):
 		seek = self.getSeek()
 		if seek is None:
@@ -57,26 +68,37 @@ class ServicePosition(Converter, Poll, object):
 		else:
 			if self.type == self.TYPE_LENGTH:
 				l = self.length
-			elif self.type == self.TYPE_POSITION:
+			elif self.type in [self.TYPE_POSITION, self.TYPE_POSITION_DETAILED]:
 				l = self.position
 			elif self.type == self.TYPE_REMAINING:
 				l = self.length - self.position
-			
-			l /= 90000
-			return "%d:%02d" % (l/60, l%60)
+
+			if self.type != self.TYPE_POSITION_DETAILED:
+				l /= 90000
+
+			if l > 0:
+				sign = ""
+			else:
+				l = -l
+				sign = "-"
+
+			if self.type != self.TYPE_POSITION_DETAILED:
+				return sign + "%d:%02d" % (l/60, l%60)
+			else:
+				return sign + "%d:%02d:%03d" % ((l/60/90000), (l/90000)%60, (l%90000)/90)
 
 	position = property(getPosition)
 	length = property(getLength)
 	cutlist = property(getCutlist)
 	text = property(getText)
-	
-	def changed(self, *args):
-		cutlist_refresh = len(args) and args[0] in [iPlayableService.evCuesheetChanged, iPlayableService.evStart, iPlayableService.evEnd]
-		time_refresh = not len(args) or args[0] in [iPlayableService.evStart, iPlayableService.evEnd]
-		
+
+	def changed(self, what):
+		cutlist_refresh = what[0] != self.CHANGED_SPECIFIC or what[1] in [iPlayableService.evCuesheetChanged]
+		time_refresh = what[0] == self.CHANGED_POLL or what[0] == self.CHANGED_SPECIFIC and what[1] in [iPlayableService.evCuesheetChanged]
+
 		if cutlist_refresh:
 			if self.type == self.TYPE_GAUGE:
 				self.downstream_elements.cutlist_changed()
 
 		if time_refresh:
-			self.downstream_elements.changed()
+			self.downstream_elements.changed(what)