servicedvb: also delete .ap and .cuts file when deleting movie

[enigma2.git] / Navigation.py

diff --git a/Navigation.py b/Navigation.py
index d8a98b12e59aad865c1b8ab0efa2ee4549c944fc..c42a62e5f60bd129c46e9c83c6c4c3e781f74798 100644 (file)
--- a/Navigation.py
+++ b/Navigation.py
@@ -21,7 +21,6 @@ class Navigation:
                self.event = [ ]
                self.currentlyPlayingService = None
                self.currentlyPlayingServiceReference = None
-               self.lastServiceRef = None
                
                self.RecordTimer = RecordTimer.RecordTimer()
 
@@ -30,7 +29,6 @@ class Navigation:
                        x(i)
        
        def playService(self, ref):
-               self.lastServiceRef = self.currentlyPlayingServiceReference
                self.currentlyPlayingServiceReference = None
                if ref is None:
                        self.stopService()
@@ -41,9 +39,6 @@ class Navigation:
                        return 0
                return 1
        
-       def zapLast(self):
-               return self.playService(self.lastServiceRef)
-       
        def getCurrentlyPlayingServiceReference(self):
                return self.currentlyPlayingServiceReference
        
@@ -59,9 +54,6 @@ class Navigation:
                else:
                        return service
        
-       def enqueueService(self, ref):
-               return self.pnav.enqueueService(ref)
-       
        def getCurrentService(self):
                service = self.pnav.getCurrentService()
                
@@ -73,12 +65,6 @@ class Navigation:
        def stopService(self):
                self.pnav.stopService()
        
-       def getPlaylist(self):
-               playlist = ePlaylistPtr()
-               if self.pnav.getPlaylist(playlist):
-                       return None
-               return playlist
-       
        def pause(self, p):
                return self.pnav.pause(p)
        
@@ -91,6 +77,7 @@ class Navigation:
        
        def shutdown(self):
                self.RecordTimer.shutdown()
+               del self.pnav
 
        def stopUserServices(self):
                self.stopService()