X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/5fbb147923216732919d2d135e45858afc6d34b5..037327649ee652a86d20a27d1127bb6886e2f671:/Navigation.py

diff --git a/Navigation.py b/Navigation.py
index cde4ca4c..eb1a2b14 100644
--- a/Navigation.py
+++ b/Navigation.py
@@ -1,4 +1,4 @@
-from enigma import eServiceCenter, eServiceReference, pNavigation, getBestPlayableServiceReference
+from enigma import eServiceCenter, eServiceReference, pNavigation, getBestPlayableServiceReference, iPlayableService
 from Components.ParentalControl import parentalControl
 from Tools.BoundFunction import boundFunction
 import RecordTimer
@@ -7,8 +7,6 @@ import SleepTimer
 import NavigationInstance
 import ServiceReference
 
-from time import time
-
 # TODO: remove pNavgation, eNavigation and rewrite this stuff in python.
 class Navigation:
 	def __init__(self):
@@ -34,6 +32,9 @@ class Navigation:
 	def dispatchEvent(self, i):
 		for x in self.event:
 			x(i)
+		if i == iPlayableService.evEnd:
+			self.currentlyPlayingServiceReference = None
+			self.currentlyPlayingService = None
 
 	def dispatchRecordEvent(self, rec_service, event):
 #		print "record_event", rec_service, event
@@ -46,8 +47,6 @@ class Navigation:
 			print "ignore request to play already running service"
 			return 0
 		print "playing", ref and ref.toString()
-		self.currentlyPlayingServiceReference = None
-		self.currentlyPlayingService = None
 		if ref is None:
 			self.stopService()
 			return 0
@@ -100,19 +99,10 @@ class Navigation:
 		print "stopService"
 		if self.pnav:
 			self.pnav.stopService()
-		self.currentlyPlayingService = None
-		self.currentlyPlayingServiceReference = None
 
 	def pause(self, p):
 		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)
-		entry = RecordTimer.RecordTimerEntry(ref, begin, end, name, description, eit)
-		self.RecordTimer.record(entry)
-		return entry
-	
 	def shutdown(self):
 		self.RecordTimer.shutdown()
 		self.ServiceHandler = None