add filename to record prepare
[enigma2.git] / Navigation.py
index 57c1283..b71c93c 100644 (file)
@@ -11,8 +11,8 @@ class Navigation:
                        raise NavigationInstance.instance
                
                NavigationInstance.instance = self
-               self.ServiceHandler = eServiceCenterPtr()
-               eServiceCenter.getInstance(self.ServiceHandler)
+               self.ServiceHandler = eServiceCenter.getInstance()
+               print self.ServiceHandler
 
                import Navigation as Nav
                Nav.navcore = self
@@ -45,8 +45,9 @@ class Navigation:
                print "recording service: %s" % (str(ref))
                if isinstance(ref, ServiceReference.ServiceReference):
                        ref = ref.ref
-               service = iRecordableServicePtr()
-               if self.pnav.recordService(ref, service):
+               service = self.pnav.recordService(ref)
+               
+               if service is None:
                        print "record returned non-zero"
                        return None
                else:
@@ -57,9 +58,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 +74,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