git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- add PMT pid to program info
[enigma2.git]
/
Navigation.py
diff --git
a/Navigation.py
b/Navigation.py
index 57c128390316df09a1c5daf899496e574fd2ffab..b71c93c54d75f711bfcece39f60c67aabf201f85 100644
(file)
--- a/
Navigation.py
+++ b/
Navigation.py
@@
-11,8
+11,8
@@
class Navigation:
raise NavigationInstance.instance
NavigationInstance.instance = self
raise NavigationInstance.instance
NavigationInstance.instance = self
- self.ServiceHandler = eServiceCenter
Ptr
()
- eServiceCenter.getInstance(self.ServiceHandler)
+ self.ServiceHandler = eServiceCenter
.getInstance
()
+ print self.ServiceHandler
import Navigation as Nav
Nav.navcore = self
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
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:
print "record returned non-zero"
return None
else:
@@
-57,9
+58,11
@@
class Navigation:
return self.pnav.enqueueService(ref)
def getCurrentService(self):
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 None
+
return service
def getPlaylist(self):
return service
def getPlaylist(self):
@@
-71,10
+74,10
@@
class Navigation:
def pause(self, p):
return self.pnav.pause(p)
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)
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
self.RecordTimer.record(entry)
return entry