fixes

[enigma2.git] / Navigation.py

diff --git a/Navigation.py b/Navigation.py
index 7e7c0f218d72235fbfc6bf90bd7c7b2e67c04d48..a0f40baf4e032c305ba06836e7f77d31e7e23f63 100644 (file)
--- a/Navigation.py
+++ b/Navigation.py
@@ -19,18 +19,25 @@ class Navigation:
                self.pnav = pNavigation()
                self.pnav.m_event.get().append(self.callEvent)
                self.event = [ ]
-               self.currentlyPlayingService = None
                self.currentlyPlayingServiceReference = None
-               
+               self.currentlyPlayingService = None
+               self.state = 0
                self.RecordTimer = RecordTimer.RecordTimer()
 
        def callEvent(self, i):
+               self.state = i != 1
                for x in self.event:
                        x(i)
-       
+
        def playService(self, ref):
+               print "playing", ref.toString()
                self.currentlyPlayingServiceReference = None
-               if not self.pnav.playService(ref):
+               self.currentlyPlayingService = None
+               if ref is None:
+                       self.stopService()
+                       return 0
+               
+               if self.pnav and not self.pnav.playService(ref):
                        self.currentlyPlayingServiceReference = ref
                        return 0
                return 1
@@ -42,43 +49,41 @@ class Navigation:
                print "recording service: %s" % (str(ref))
                if isinstance(ref, ServiceReference.ServiceReference):
                        ref = ref.ref
-               service = self.pnav.recordService(ref)
+               service = self.pnav and self.pnav.recordService(ref)
                
                if service is None:
                        print "record returned non-zero"
                        return None
                else:
                        return service
-       
-       def enqueueService(self, ref):
-               return self.pnav.enqueueService(ref)
-       
+
        def getCurrentService(self):
-               service = self.pnav.getCurrentService()
-               
-               if service is None:
-                       return None
-               
-               return service
-       
+               if self.state:
+                       if not self.currentlyPlayingService:
+                               self.currentlyPlayingService = self.pnav and self.pnav.getCurrentService()
+                       return self.currentlyPlayingService
+               return None
+
        def stopService(self):
-               self.pnav.stopService()
-       
-       def getPlaylist(self):
-               playlist = ePlaylistPtr()
-               if self.pnav.getPlaylist(playlist):
-                       return None
-               return playlist
-       
+               if self.pnav:
+                       self.pnav.stopService()
+               self.currentlyPlayingService = None
+               self.currentlyPlayingServiceReference = None
+
        def pause(self, p):
-               return self.pnav.pause(p)
-       
-       def recordWithTimer(self, begin, end, ref, epg, description):
+               return self.pnav and self.pnav.pause(p)
+
+       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()
+               self.ServiceHandler = None
+               self.pnav = None
+
+       def stopUserServices(self):
+               self.stopService()