retry the waiting message

[enigma2.git] / Navigation.py

diff --git a/Navigation.py b/Navigation.py
index 9c20703668b782d8e58070a61722ea0940c536ee..d8a98b12e59aad865c1b8ab0efa2ee4549c944fc 100644 (file)
--- a/Navigation.py
+++ b/Navigation.py
@@ -20,6 +20,8 @@ class Navigation:
                self.pnav.m_event.get().append(self.callEvent)
                self.event = [ ]
                self.currentlyPlayingService = None
                self.pnav.m_event.get().append(self.callEvent)
                self.event = [ ]
                self.currentlyPlayingService = None

+               self.currentlyPlayingServiceReference = None
+               self.lastServiceRef = None

                
                self.RecordTimer = RecordTimer.RecordTimer()
 
                
                self.RecordTimer = RecordTimer.RecordTimer()
 


@@ -28,12 +30,20 @@ class Navigation:
                        x(i)
        
        def playService(self, ref):
                        x(i)
        
        def playService(self, ref):

+               self.lastServiceRef = self.currentlyPlayingServiceReference

                self.currentlyPlayingServiceReference = None
                self.currentlyPlayingServiceReference = None

+               if ref is None:
+                       self.stopService()
+                       return 0
+               

                if not self.pnav.playService(ref):
                        self.currentlyPlayingServiceReference = ref
                        return 0
                return 1
        
                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
        
        def getCurrentlyPlayingServiceReference(self):
                return self.currentlyPlayingServiceReference
        


@@ -72,12 +82,15 @@ class Navigation:
        def pause(self, p):
                return self.pnav.pause(p)
        
        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)
                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()
                self.RecordTimer.record(entry)
                return entry
        
        def shutdown(self):
                self.RecordTimer.shutdown()

+
+       def stopUserServices(self):
+               self.stopService()