fixes

[enigma2.git] / Navigation.py

diff --git a/Navigation.py b/Navigation.py
index b71c93c54d75f711bfcece39f60c67aabf201f85..a0f40baf4e032c305ba06836e7f77d31e7e23f63 100644 (file)
--- a/Navigation.py
+++ b/Navigation.py
@@ -12,28 +12,32 @@ class Navigation:
                
                NavigationInstance.instance = self
                self.ServiceHandler = eServiceCenter.getInstance()
                
                NavigationInstance.instance = self
                self.ServiceHandler = eServiceCenter.getInstance()

-               print self.ServiceHandler

 
                import Navigation as Nav
                Nav.navcore = self
                
 
                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.pnav = pNavigation()
                self.pnav.m_event.get().append(self.callEvent)
                self.event = [ ]

+               self.currentlyPlayingServiceReference = None

                self.currentlyPlayingService = None
                self.currentlyPlayingService = None

-               
+               self.state = 0

                self.RecordTimer = RecordTimer.RecordTimer()
 
        def callEvent(self, i):
                self.RecordTimer = RecordTimer.RecordTimer()
 
        def callEvent(self, i):

+               self.state = i != 1

                for x in self.event:
                        x(i)
                for x in self.event:
                        x(i)

-       
+

        def playService(self, ref):
        def playService(self, ref):

+               print "playing", ref.toString()

                self.currentlyPlayingServiceReference = None
                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
                        self.currentlyPlayingServiceReference = ref
                        return 0
                return 1


@@ -45,41 +49,41 @@ class Navigation:
                print "recording service: %s" % (str(ref))
                if isinstance(ref, ServiceReference.ServiceReference):
                        ref = ref.ref
                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:
                
                if service is None:
                        print "record returned non-zero"
                        return None
                else:

-                       print "ok, recordService didn't fail"

                        return service
                        return service

-       
-       def enqueueService(self, ref):
-               return self.pnav.enqueueService(ref)
-       
+

        def getCurrentService(self):
        def getCurrentService(self):

-               service = self.pnav.getCurrentService()
-               
-               if service is None:
-                       return None
-               
-               return service
-       
-       def getPlaylist(self):
-               playlist = ePlaylistPtr()
-               if self.pnav.getPlaylist(playlist):
-                       return None
-               return playlist
-       
+               if self.state:
+                       if not self.currentlyPlayingService:
+                               self.currentlyPlayingService = self.pnav and self.pnav.getCurrentService()
+                       return self.currentlyPlayingService
+               return None
+
+       def stopService(self):
+               if self.pnav:
+                       self.pnav.stopService()
+               self.currentlyPlayingService = None
+               self.currentlyPlayingServiceReference = None
+

        def pause(self, p):
        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)
                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()

+               self.ServiceHandler = None
+               self.pnav = None
+
+       def stopUserServices(self):
+               self.stopService()