git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
don't crash when removing a marker from bouquet list
[enigma2.git]
/
Navigation.py
diff --git
a/Navigation.py
b/Navigation.py
index 7c1cdd426131d1d5343a82ce379395fa74f5c61e..53e9ed426153516466b627d147e2aeadd7fd17b7 100644
(file)
--- a/
Navigation.py
+++ b/
Navigation.py
@@
-22,19
+22,26
@@
class Navigation:
Nav.navcore = self
self.pnav = pNavigation()
Nav.navcore = self
self.pnav = pNavigation()
- self.pnav.m_event.get().append(self.callEvent)
+ self.pnav.m_event.get().append(self.dispatchEvent)
+ self.pnav.m_record_event.get().append(self.dispatchRecordEvent)
self.event = [ ]
self.event = [ ]
+ self.record_event = [ ]
self.currentlyPlayingServiceReference = None
self.currentlyPlayingService = None
self.state = 0
self.RecordTimer = RecordTimer.RecordTimer()
self.SleepTimer = SleepTimer.SleepTimer()
self.currentlyPlayingServiceReference = None
self.currentlyPlayingService = None
self.state = 0
self.RecordTimer = RecordTimer.RecordTimer()
self.SleepTimer = SleepTimer.SleepTimer()
-
- def
call
Event(self, i):
+
+ def
dispatch
Event(self, i):
self.state = i != 1
for x in self.event:
x(i)
self.state = i != 1
for x in self.event:
x(i)
+ def dispatchRecordEvent(self, rec_service, event):
+# print "record_event", rec_service, event
+ for x in self.record_event:
+ x(rec_service, event)
+
def playService(self, ref, checkParentalControl = True):
print "playing", ref and ref.toString()
self.currentlyPlayingServiceReference = None
def playService(self, ref, checkParentalControl = True):
print "playing", ref and ref.toString()
self.currentlyPlayingServiceReference = None
@@
-66,6
+73,13
@@
class Navigation:
else:
return service
else:
return service
+ def stopRecordService(self, service):
+ ret = self.pnav and self.pnav.stopRecordService(service)
+ return ret
+
+ def getRecordings(self):
+ return self.pnav and self.pnav.getRecordings()
+
def getCurrentService(self):
if self.state:
if not self.currentlyPlayingService:
def getCurrentService(self):
if self.state:
if not self.currentlyPlayingService: