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 fcf19763cdc72d088bd26e7cbcd24b7fc617abe2..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):
@@
-30,14
+32,14
@@
class Navigation:
x(i)
def playService(self, ref):
x(i)
def playService(self, ref):
- print "playing", ref.toString()
+ print "playing", ref
and ref
.toString()
self.currentlyPlayingServiceReference = None
self.currentlyPlayingService = None
if ref is None:
self.stopService()
return 0
self.currentlyPlayingServiceReference = None
self.currentlyPlayingService = None
if ref is None:
self.stopService()
return 0
- if not self.pnav.playService(ref):
+ if
self.pnav and
not self.pnav.playService(ref):
self.currentlyPlayingServiceReference = ref
return 0
return 1
self.currentlyPlayingServiceReference = ref
return 0
return 1
@@
-49,7
+51,7
@@
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"
if service is None:
print "record returned non-zero"
@@
-60,17
+62,19
@@
class Navigation:
def getCurrentService(self):
if self.state:
if not self.currentlyPlayingService:
def getCurrentService(self):
if self.state:
if not self.currentlyPlayingService:
- self.currentlyPlayingService = self.pnav.getCurrentService()
+ self.currentlyPlayingService = self.pnav
and self.pnav
.getCurrentService()
return self.currentlyPlayingService
return None
def stopService(self):
return self.currentlyPlayingService
return None
def stopService(self):
- self.pnav.stopService()
+ print "stopService"
+ if self.pnav:
+ self.pnav.stopService()
self.currentlyPlayingService = None
self.currentlyPlayingServiceReference = None
def pause(self, p):
self.currentlyPlayingService = None
self.currentlyPlayingServiceReference = None
def pause(self, p):
- return self.pnav.pause(p)
+ return self.pnav
and self.pnav
.pause(p)
def recordWithTimer(self, ref, begin, end, name, description, eit):
if isinstance(ref, eServiceReference):
def recordWithTimer(self, ref, begin, end, name, description, eit):
if isinstance(ref, eServiceReference):
@@
-81,8
+85,8
@@
class Navigation:
def shutdown(self):
self.RecordTimer.shutdown()
def shutdown(self):
self.RecordTimer.shutdown()
- del self.ServiceHandler
- del self.pnav
+ self.ServiceHandler = None
+ self.pnav = None
def stopUserServices(self):
self.stopService()
def stopUserServices(self):
self.stopService()