fix typo

[enigma2.git] / Navigation.py

diff --git a/Navigation.py b/Navigation.py
index 751aca897d3c7a4638eb0a03748d914a513557c1..e65edbb21ad2ad0688fee7e9d68956f0abaae01f 100644 (file)
--- a/Navigation.py
+++ b/Navigation.py
@@ -19,17 +19,20 @@ 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
+               self.currentlyPlayingService = None
                if ref is None:
                        self.stopService()
                        return 0
@@ -53,27 +56,18 @@ class Navigation:
                        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.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
-       
+               self.currentlyPlayingService = None
+
        def pause(self, p):
                return self.pnav.pause(p)
        
@@ -86,6 +80,7 @@ class Navigation:
        
        def shutdown(self):
                self.RecordTimer.shutdown()
+               del self.pnav
 
        def stopUserServices(self):
                self.stopService()