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 FrontendStatus source, add converter to SNR/AGC/BER bar and text
[enigma2.git]
/
Navigation.py
diff --git
a/Navigation.py
b/Navigation.py
index b71c93c54d75f711bfcece39f60c67aabf201f85..8ff1be0cc3d7327f94817b53b434fb836c9f44a5 100644
(file)
--- a/
Navigation.py
+++ b/
Navigation.py
@@
-12,18
+12,15
@@
class Navigation:
NavigationInstance.instance = self
self.ServiceHandler = eServiceCenter.getInstance()
NavigationInstance.instance = self
self.ServiceHandler = eServiceCenter.getInstance()
- print self.ServiceHandler
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.currentlyPlayingService = None
self.pnav = pNavigation()
self.pnav.m_event.get().append(self.callEvent)
self.event = [ ]
self.currentlyPlayingService = None
+ self.currentlyPlayingServiceReference = None
self.RecordTimer = RecordTimer.RecordTimer()
self.RecordTimer = RecordTimer.RecordTimer()
@@
-32,7
+29,12
@@
class Navigation:
x(i)
def playService(self, ref):
x(i)
def playService(self, ref):
+ print "playing", ref
self.currentlyPlayingServiceReference = None
self.currentlyPlayingServiceReference = None
+ if ref is None:
+ self.stopService()
+ return 0
+
if not self.pnav.playService(ref):
self.currentlyPlayingServiceReference = ref
return 0
if not self.pnav.playService(ref):
self.currentlyPlayingServiceReference = ref
return 0
@@
-51,12
+53,8
@@
class Navigation:
print "record returned non-zero"
return None
else:
print "record returned non-zero"
return None
else:
- print "ok, recordService didn't fail"
return service
return service
- def enqueueService(self, ref):
- return self.pnav.enqueueService(ref)
-
def getCurrentService(self):
service = self.pnav.getCurrentService()
def getCurrentService(self):
service = self.pnav.getCurrentService()
@@
-65,21
+63,22
@@
class Navigation:
return service
return service
- def getPlaylist(self):
- playlist = ePlaylistPtr()
- if self.pnav.getPlaylist(playlist):
- return None
- return playlist
+ def stopService(self):
+ self.pnav.stopService()
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, description
):
+ def recordWithTimer(self,
ref, begin, end, name, description, eit
):
if isinstance(ref, eServiceReference):
ref = ServiceReference.ServiceReference(ref)
if isinstance(ref, eServiceReference):
ref = ServiceReference.ServiceReference(ref)
- entry = RecordTimer.RecordTimerEntry(
begin, end, ref, epg, description
)
+ entry = RecordTimer.RecordTimerEntry(
ref, begin, end, name, description, eit
)
self.RecordTimer.record(entry)
return entry
def shutdown(self):
self.RecordTimer.shutdown()
self.RecordTimer.record(entry)
return entry
def shutdown(self):
self.RecordTimer.shutdown()
+ del self.pnav
+
+ def stopUserServices(self):
+ self.stopService()