git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix tunerlist, force both tuners as available
[enigma2.git]
/
Navigation.py
diff --git
a/Navigation.py
b/Navigation.py
index 5fe2651783d94c40276346badf41f17f95ff2f33..6934f11f4a316b459e6c5aaa96eba04af9efc031 100644
(file)
--- a/
Navigation.py
+++ b/
Navigation.py
@@
-11,15
+11,11
@@
class Navigation:
raise NavigationInstance.instance
NavigationInstance.instance = self
raise NavigationInstance.instance
NavigationInstance.instance = self
- self.ServiceHandler = eServiceCenterPtr()
- eServiceCenter.getInstance(self.ServiceHandler)
+ self.ServiceHandler = eServiceCenter.getInstance()
import Navigation as Nav
Nav.navcore = self
import Navigation as Nav
Nav.navcore = self
- print "Navcore instance set!"
- print Nav.navcore
-
self.pnav = pNavigation()
self.pnav.m_event.get().append(self.callEvent)
self.event = [ ]
self.pnav = pNavigation()
self.pnav.m_event.get().append(self.callEvent)
self.event = [ ]
@@
-45,21
+41,23
@@
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:
- print "ok, recordService didn't fail"
return service
def enqueueService(self, ref):
return self.pnav.enqueueService(ref)
def getCurrentService(self):
return service
def enqueueService(self, ref):
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):