add TYPE_RELATIVE support for the ServicePosition component

[enigma2.git] / lib / python / Components / ServicePosition.py

diff --git a/lib/python/Components/ServicePosition.py b/lib/python/Components/ServicePosition.py
index 0cbe500d932a54d192b6ea28520483a71f7347d7..467a80e3161778f61a1f6ea5b78b4eaf0963fad8 100644 (file)
--- a/lib/python/Components/ServicePosition.py
+++ b/lib/python/Components/ServicePosition.py
@@ -1,12 +1,12 @@
-from PerServiceDisplay import *
-from enigma import eTimer
-
-from enigma import iPlayableService, iSeekableServicePtr, ePositionGauge
+from PerServiceDisplay import PerServiceDisplay, PerServiceBase
+from enigma import eTimer, iPlayableService, iSeekableServicePtr, ePositionGauge
+import time
 
 class ServicePosition(PerServiceDisplay):
        TYPE_LENGTH = 0,
        TYPE_POSITION = 1,
-       TYPE_REMAINING = 2
+       TYPE_REMAINING = 2,
+       TYPE_RELATIVE = 3
        
        def __init__(self, navcore, type):
                self.updateTimer = eTimer()
@@ -17,6 +17,7 @@ class ServicePosition(PerServiceDisplay):
                                iPlayableService.evEnd: self.stopEvent
                        })
                self.type = type
+               self.relative_base = 0
 #              self.setType(type)
 
        def newService(self):
@@ -28,18 +29,19 @@ class ServicePosition(PerServiceDisplay):
                self.updateTimer.start(500)
                self.update()
        
+       def setRelative(self, rel):
+               self.relative_base = rel
+       
        def get(self, what):
                service = self.navcore.getCurrentService()
-               
-               if service != None:
-                       seek = service.seek()
-                       if seek != None:
-                               if what == self.TYPE_LENGTH:
-                                       r = seek.getLength()
-                               elif what == self.TYPE_POSITION:
-                                       r = seek.getPlayPosition()
-                               if not r[0]:
-                                       return r[1] / 90000
+               seek = service and service.seek()
+               if seek != None:
+                       if what == self.TYPE_LENGTH:
+                               r = seek.getLength()
+                       elif what == self.TYPE_POSITION:
+                               r = seek.getPlayPosition()
+                       if not r[0]:
+                               return r[1] / 90000
                
                return -1
        
@@ -50,14 +52,26 @@ class ServicePosition(PerServiceDisplay):
                        seek = service.seek()
 
                if seek is not None:
-                       if self.type == self.TYPE_LENGTH:
-                               l = self.get(self.TYPE_LENGTH)
-                       elif self.type == self.TYPE_POSITION:
-                               l = self.get(self.TYPE_POSITION)
-                       elif self.type == self.TYPE_REMAINING:
-                               l = self.get(self.TYPE_LENGTH) - self.get(self.TYPE_POSITION)
+                       if self.type != self.TYPE_RELATIVE:
+                               if self.type == self.TYPE_LENGTH:
+                                       l = self.get(self.TYPE_LENGTH)
+                               elif self.type == self.TYPE_POSITION:
+                                       l = self.get(self.TYPE_POSITION)
+                               elif self.type == self.TYPE_REMAINING:
+                                       l = self.get(self.TYPE_LENGTH) - self.get(self.TYPE_POSITION)
                        
-                       self.setText("%d:%02d" % (l/60, l%60))
+                               self.setText("%d:%02d" % (l/60, l%60))
+                       else:
+                               l = self.get(self.TYPE_POSITION)
+                               if l != -1:
+                                       l += self.relative_base
+                                       t = time.localtime(l)
+                                       timestr = "%2d:%02d:%02d" % (t.tm_hour, t.tm_min, t.tm_sec)
+                               else:
+                                       timestr = ""
+
+                               self.setText(timestr)
+                               
                        self.updateTimer.start(500)
                else:
                        self.updateTimer.start(10000)
@@ -72,20 +86,21 @@ class ServicePositionGauge(PerServiceBase):
                PerServiceBase.__init__(self, navcore,
                        {
                                iPlayableService.evStart: self.newService,
-                               iPlayableService.evEnd: self.stopEvent
+                               iPlayableService.evEnd: self.stopEvent,
+                               iPlayableService.evCuesheetChanged: self.newCuesheet
                        })
+               self.instance = None
 
        def newService(self):
                if self.get() is None:  
                        self.disablePolling()
                else:
                        self.enablePolling(interval=500)
+                       self.newCuesheet()
        
        def get(self):
                service = self.navcore.getCurrentService()
-               if service is None:
-                       return None
-               seek = service.seek()
+               seek = service and service.seek()
                if seek is None:
                        return None
 
@@ -110,6 +125,14 @@ class ServicePositionGauge(PerServiceBase):
 
        def GUIcreate(self, parent):
                self.instance = ePositionGauge(parent)
+               self.newService()
        
        def GUIdelete(self):
                self.instance = None
+
+       def newCuesheet(self):
+               service = self.navcore.getCurrentService()
+               cue = service and service.cueSheet()
+               cutlist = (cue and cue.getCutList()) or [ ]
+               if self.instance is not None:
+                       self.instance.setInOutList(cutlist)