don't crash if time is *really* invalid

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

diff --git a/lib/python/Components/ServicePosition.py b/lib/python/Components/ServicePosition.py
index 349ee392a5b27c9cb596a4cf9c25d0097d0e09e9..ba87e3ef680df8438255f6a9a38352115d41a18b 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,
 
 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()
        
        def __init__(self, navcore, type):
                self.updateTimer = eTimer()


@@ -17,6 +17,7 @@ class ServicePosition(PerServiceDisplay):
                                iPlayableService.evEnd: self.stopEvent
                        })
                self.type = type
                                iPlayableService.evEnd: self.stopEvent
                        })
                self.type = type

+               self.relative_base = 0

 #              self.setType(type)
 
        def newService(self):
 #              self.setType(type)
 
        def newService(self):


@@ -28,6 +29,9 @@ class ServicePosition(PerServiceDisplay):
                self.updateTimer.start(500)
                self.update()
        
                self.updateTimer.start(500)
                self.update()
        

+       def setRelative(self, rel):
+               self.relative_base = rel
+       

        def get(self, what):
                service = self.navcore.getCurrentService()
                seek = service and service.seek()
        def get(self, what):
                service = self.navcore.getCurrentService()
                seek = service and service.seek()


@@ -48,14 +52,29 @@ class ServicePosition(PerServiceDisplay):
                        seek = service.seek()
 
                if seek is not None:
                        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
+                                       try:
+                                               t = time.localtime(l)
+                                               timestr = "%2d:%02d:%02d" % (t.tm_hour, t.tm_min, t.tm_sec)
+                                       except ValueError:
+                                               timestr = ""
+                               else:
+                                       timestr = ""
+
+                               self.setText(timestr)
+                               

                        self.updateTimer.start(500)
                else:
                        self.updateTimer.start(10000)
                        self.updateTimer.start(500)
                else:
                        self.updateTimer.start(10000)


@@ -107,13 +126,11 @@ class ServicePositionGauge(PerServiceBase):
        def stopEvent(self):
                self.disablePolling()
 
        def stopEvent(self):
                self.disablePolling()
 

-       def GUIcreate(self, parent):
-               self.instance = ePositionGauge(parent)
+       GUI_WIDGET = ePositionGauge
+       
+       def postWidgetCreate(self, instance):

                self.newService()
        
                self.newService()
        

-       def GUIdelete(self):
-               self.instance = None
-

        def newCuesheet(self):
                service = self.navcore.getCurrentService()
                cue = service and service.cueSheet()
        def newCuesheet(self):
                service = self.navcore.getCurrentService()
                cue = service and service.cueSheet()