don't seek if minute seek value is 0

[enigma2.git] / Navigation.py

diff --git a/Navigation.py b/Navigation.py
index f1db8cb9ff8b934f08c016e5067e896aafefff85..d8a98b12e59aad865c1b8ab0efa2ee4549c944fc 100644 (file)
--- a/Navigation.py
+++ b/Navigation.py
@@ -11,19 +11,17 @@ class Navigation:
                        raise NavigationInstance.instance
                
                NavigationInstance.instance = self
-               self.ServiceHandler = eServiceCenterPtr()
                self.ServiceHandler = eServiceCenter.getInstance()
 
                import Navigation as Nav
                Nav.navcore = self
                
-               print "Navcore instance set!"
-               print Nav.navcore
-               
                self.pnav = pNavigation()
                self.pnav.m_event.get().append(self.callEvent)
                self.event = [ ]
                self.currentlyPlayingService = None
+               self.currentlyPlayingServiceReference = None
+               self.lastServiceRef = None
                
                self.RecordTimer = RecordTimer.RecordTimer()
 
@@ -32,12 +30,20 @@ class Navigation:
                        x(i)
        
        def playService(self, ref):
+               self.lastServiceRef = self.currentlyPlayingServiceReference
                self.currentlyPlayingServiceReference = None
+               if ref is None:
+                       self.stopService()
+                       return 0
+               
                if not self.pnav.playService(ref):
                        self.currentlyPlayingServiceReference = ref
                        return 0
                return 1
        
+       def zapLast(self):
+               return self.playService(self.lastServiceRef)
+       
        def getCurrentlyPlayingServiceReference(self):
                return self.currentlyPlayingServiceReference
        
@@ -45,12 +51,12 @@ class Navigation:
                print "recording service: %s" % (str(ref))
                if isinstance(ref, ServiceReference.ServiceReference):
                        ref = ref.ref
-               service = iRecordableServicePtr()
-               if self.pnav.recordService(ref, service):
+               service = self.pnav.recordService(ref)
+               
+               if service is None:
                        print "record returned non-zero"
                        return None
                else:
-                       print "ok, recordService didn't fail"
                        return service
        
        def enqueueService(self, ref):
@@ -64,6 +70,9 @@ class Navigation:
                
                return service
        
+       def stopService(self):
+               self.pnav.stopService()
+       
        def getPlaylist(self):
                playlist = ePlaylistPtr()
                if self.pnav.getPlaylist(playlist):
@@ -73,12 +82,15 @@ class Navigation:
        def pause(self, p):
                return self.pnav.pause(p)
        
-       def recordWithTimer(self, begin, end, ref, epg, description):
+       def recordWithTimer(self, ref, begin, end, name, description, eit):
                if isinstance(ref, eServiceReference):
                        ref = ServiceReference.ServiceReference(ref)
-               entry = RecordTimer.RecordTimerEntry(begin, end, ref, epg, description)
+               entry = RecordTimer.RecordTimerEntry(ref, begin, end, name, description, eit)
                self.RecordTimer.record(entry)
                return entry
        
        def shutdown(self):
                self.RecordTimer.shutdown()
+
+       def stopUserServices(self):
+               self.stopService()