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 typo
[enigma2.git]
/
Navigation.py
diff --git
a/Navigation.py
b/Navigation.py
index 705083f69baf68fe8e5e0c23a34a61e03f4b9d3f..e65edbb21ad2ad0688fee7e9d68956f0abaae01f 100644
(file)
--- a/
Navigation.py
+++ b/
Navigation.py
@@
-19,19
+19,20
@@
class Navigation:
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 = [ ]
- self.currentlyPlayingService = None
self.currentlyPlayingServiceReference = None
self.currentlyPlayingServiceReference = None
- self.
lastServiceRef
= None
-
+ self.
currentlyPlayingService
= None
+ self.state = 0
self.RecordTimer = RecordTimer.RecordTimer()
def callEvent(self, i):
self.RecordTimer = RecordTimer.RecordTimer()
def callEvent(self, i):
+ self.state = i != 1
for x in self.event:
x(i)
for x in self.event:
x(i)
-
+
def playService(self, ref):
def playService(self, ref):
- self.lastServiceRef = self.currentlyPlayingServiceReference
+ print "playing", ref.toString()
self.currentlyPlayingServiceReference = None
self.currentlyPlayingServiceReference = None
+ self.currentlyPlayingService = None
if ref is None:
self.stopService()
return 0
if ref is None:
self.stopService()
return 0
@@
-41,9
+42,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
@@
-58,18
+56,18
@@
class Navigation:
return None
else:
return service
return None
else:
return service
-
+
def getCurrentService(self):
def getCurrentService(self):
- service = self.pnav.getCurrentService()
-
- if service is None:
- return None
-
- return service
-
+ if self.state:
+ if not self.currentlyPlayingService:
+ self.currentlyPlayingService = self.pnav.getCurrentService()
+ return self.currentlyPlayingService
+ return None
+
def stopService(self):
self.pnav.stopService()
def stopService(self):
self.pnav.stopService()
-
+ self.currentlyPlayingService = None
+
def pause(self, p):
return self.pnav.pause(p)
def pause(self, p):
return self.pnav.pause(p)
@@
-82,6
+80,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()