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 static responses
[enigma2.git]
/
Navigation.py
diff --git
a/Navigation.py
b/Navigation.py
index d8a98b12e59aad865c1b8ab0efa2ee4549c944fc..8ff1be0cc3d7327f94817b53b434fb836c9f44a5 100644
(file)
--- a/
Navigation.py
+++ b/
Navigation.py
@@
-21,7
+21,6
@@
class Navigation:
self.event = [ ]
self.currentlyPlayingService = None
self.currentlyPlayingServiceReference = None
self.event = [ ]
self.currentlyPlayingService = None
self.currentlyPlayingServiceReference = None
- self.lastServiceRef = None
self.RecordTimer = RecordTimer.RecordTimer()
self.RecordTimer = RecordTimer.RecordTimer()
@@
-30,7
+29,7
@@
class Navigation:
x(i)
def playService(self, ref):
x(i)
def playService(self, ref):
- self.lastServiceRef = self.currentlyPlayingServiceReference
+ print "playing", ref
self.currentlyPlayingServiceReference = None
if ref is None:
self.stopService()
self.currentlyPlayingServiceReference = None
if ref is None:
self.stopService()
@@
-41,9
+40,6
@@
class Navigation:
return 0
return 1
return 0
return 1
- def zapLast(self):
- return self.playService(self.lastServiceRef)
-
def getCurrentlyPlayingServiceReference(self):
return self.currentlyPlayingServiceReference
def getCurrentlyPlayingServiceReference(self):
return self.currentlyPlayingServiceReference
@@
-59,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()
@@
-73,12
+66,6
@@
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)
@@
-91,6
+78,7
@@
class Navigation:
def shutdown(self):
self.RecordTimer.shutdown()
def shutdown(self):
self.RecordTimer.shutdown()
+ del self.pnav
def stopUserServices(self):
self.stopService()
def stopUserServices(self):
self.stopService()