git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove non existing file
[enigma2.git]
/
Navigation.py
diff --git
a/Navigation.py
b/Navigation.py
index 9c20703668b782d8e58070a61722ea0940c536ee..8ff1be0cc3d7327f94817b53b434fb836c9f44a5 100644
(file)
--- a/
Navigation.py
+++ b/
Navigation.py
@@
-20,6
+20,7
@@
class Navigation:
self.pnav.m_event.get().append(self.callEvent)
self.event = [ ]
self.currentlyPlayingService = None
self.pnav.m_event.get().append(self.callEvent)
self.event = [ ]
self.currentlyPlayingService = None
+ self.currentlyPlayingServiceReference = None
self.RecordTimer = RecordTimer.RecordTimer()
self.RecordTimer = RecordTimer.RecordTimer()
@@
-28,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
@@
-49,9
+55,6
@@
class Navigation:
else:
return service
else:
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()
@@
-63,21
+66,19
@@
class Navigation:
def stopService(self):
self.pnav.stopService()
def stopService(self):
self.pnav.stopService()
- def getPlaylist(self):
- playlist = ePlaylistPtr()
- if self.pnav.getPlaylist(playlist):
- return None
- return playlist
-
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()