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 priorities
[enigma2.git]
/
Navigation.py
diff --git
a/Navigation.py
b/Navigation.py
index 7e7c0f218d72235fbfc6bf90bd7c7b2e67c04d48..7b615bbdab6d37b6cb076ba1b11e92222f0c9a54 100644
(file)
--- a/
Navigation.py
+++ b/
Navigation.py
@@
-4,6
+4,8
@@
import RecordTimer
import NavigationInstance
import ServiceReference
import NavigationInstance
import ServiceReference
+from time import time
+
# TODO: remove pNavgation, eNavigation and rewrite this stuff in python.
class Navigation:
def __init__(self):
# TODO: remove pNavgation, eNavigation and rewrite this stuff in python.
class Navigation:
def __init__(self):
@@
-19,18
+21,25
@@
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.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):
+ print "playing", ref and ref.toString()
self.currentlyPlayingServiceReference = None
self.currentlyPlayingServiceReference = None
- if not self.pnav.playService(ref):
+ self.currentlyPlayingService = None
+ if ref is None:
+ self.stopService()
+ return 0
+
+ if self.pnav and not self.pnav.playService(ref):
self.currentlyPlayingServiceReference = ref
return 0
return 1
self.currentlyPlayingServiceReference = ref
return 0
return 1
@@
-42,43
+51,42
@@
class Navigation:
print "recording service: %s" % (str(ref))
if isinstance(ref, ServiceReference.ServiceReference):
ref = ref.ref
print "recording service: %s" % (str(ref))
if isinstance(ref, ServiceReference.ServiceReference):
ref = ref.ref
- service = self.pnav.recordService(ref)
+ service = self.pnav
and self.pnav
.recordService(ref)
if service is None:
print "record returned non-zero"
return None
else:
return service
if service is None:
print "record returned non-zero"
return None
else:
return service
-
- def enqueueService(self, ref):
- return self.pnav.enqueueService(ref)
-
+
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 and self.pnav.getCurrentService()
+ return self.currentlyPlayingService
+ return None
+
def stopService(self):
def stopService(self):
- self.pnav.stopService()
-
- def getPlaylist(self):
- playlist = ePlaylistPtr()
- if self.pnav.getPlaylist(playlist):
- return None
- return playlist
-
+ print "stopService"
+ if self.pnav:
+ self.pnav.stopService()
+ self.currentlyPlayingService = None
+ self.currentlyPlayingServiceReference = None
+
def pause(self, p):
def pause(self, p):
- return self.pnav.pause(p)
-
- def recordWithTimer(self,
begin, end, ref, epg, description
):
+ return self.pnav
and self.pnav
.pause(p)
+
+ 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()
+ self.ServiceHandler = None
+ self.pnav = None
+
+ def stopUserServices(self):
+ self.stopService()