install images into DATADIR "/enigma2" and set PYTHONPATH if unset

[enigma2.git] / Navigation.py

diff --git a/Navigation.py b/Navigation.py
index 57c128390316df09a1c5daf899496e574fd2ffab..f1db8cb9ff8b934f08c016e5067e896aafefff85 100644 (file)
--- a/Navigation.py
+++ b/Navigation.py
@@ -12,7 +12,7 @@ class Navigation:
                
                NavigationInstance.instance = self
                self.ServiceHandler = eServiceCenterPtr()
-               eServiceCenter.getInstance(self.ServiceHandler)
+               self.ServiceHandler = eServiceCenter.getInstance()
 
                import Navigation as Nav
                Nav.navcore = self
@@ -57,9 +57,11 @@ class Navigation:
                return self.pnav.enqueueService(ref)
        
        def getCurrentService(self):
-               service = iPlayableServicePtr()
-               if self.pnav.getCurrentService(service):
+               service = self.pnav.getCurrentService()
+               
+               if service is None:
                        return None
+               
                return service
        
        def getPlaylist(self):
@@ -71,10 +73,10 @@ class Navigation:
        def pause(self, p):
                return self.pnav.pause(p)
        
-       def recordWithTimer(self, begin, end, ref, epg):
+       def recordWithTimer(self, begin, end, ref, epg, description):
                if isinstance(ref, eServiceReference):
                        ref = ServiceReference.ServiceReference(ref)
-               entry = RecordTimer.RecordTimerEntry(begin, end, ref, epg)
+               entry = RecordTimer.RecordTimerEntry(begin, end, ref, epg, description)
                self.RecordTimer.record(entry)
                return entry