X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/4e182b8bb929d63b9e3952524b3e39470ab26442..a4a8f52b1757b5a2f38abf21161cad1e1e24ed10:/lib/python/Screens/InfoBarGenerics.py

diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py
index d564d092..4f1cd99c 100644
--- a/lib/python/Screens/InfoBarGenerics.py
+++ b/lib/python/Screens/InfoBarGenerics.py
@@ -453,10 +453,12 @@ class InfoBarPVR:
 	SEEK_STATE_FF_8X = (0, 8, 0, 0)
 	SEEK_STATE_FF_32X = (0, 0, 0, 32)
 	SEEK_STATE_FF_64X = (0, 0, 0, 64)
+	SEEK_STATE_FF_128X = (0, 0, 0, 128)
 	
 	SEEK_STATE_BACK_4X = (0, 0, 0, -4)
 	SEEK_STATE_BACK_32X = (0, 0, 0, -32)
 	SEEK_STATE_BACK_64X = (0, 0, 0, -64)
+	SEEK_STATE_BACK_128X = (0, 0, 0, -128)
 	
 	SEEK_STATE_SM_HALF = (0, 0, 2, 0)
 	SEEK_STATE_SM_QUARTER = (0, 0, 4, 0)
@@ -483,10 +485,14 @@ class InfoBarPVR:
 		del self.seekTimer
 	
 	def seekTimerFired(self):
-		if self.skipmode > 0:
-			self.doSeek(+1, self.skipmode * self.skipinterval)
-		else:
-			self.doSeek(-1, -self.skipmode * self.skipinterval)
+		self.seekbase += self.skipmode * self.skipinterval
+		
+		# check if we bounced against the beginning of the file
+		if self.seekbase < 0:
+			self.seekbase = 0;
+			self.setSeekState(self.SEEK_STATE_PLAY)
+			
+		self.doSeek(self.seekbase)
 
 	def setSeekState(self, state):
 		oldstate = self.seekstate
@@ -509,6 +515,21 @@ class InfoBarPVR:
 			self.seekTimer.stop()
 		else:
 			self.seekTimer.start(500)
+		
+		service = self.session.nav.getCurrentService()
+		if service is None:
+			return
+		
+		seekable = service.seek()
+		if seekable is None:
+			return
+
+		if skipmode:
+			seekable.setTrickmode(1)
+		else:
+			seekable.setTrickmode(0)
+		
+		self.seekbase = seekable.getPlayPosition()[1] / 90
 	
 	def pauseService(self):
 		self.setSeekState(self.SEEK_STATE_PAUSE);
@@ -516,7 +537,7 @@ class InfoBarPVR:
 	def unPauseService(self):
 		self.setSeekState(self.SEEK_STATE_PLAY);
 	
-	def doSeek(self, dir, seektime):
+	def doSeek(self, seektime):
 		service = self.session.nav.getCurrentService()
 		if service is None:
 			return
@@ -524,7 +545,7 @@ class InfoBarPVR:
 		seekable = service.seek()
 		if seekable is None:
 			return
-		seekable.seekRelative(dir, 90 * seektime)
+		seekable.seekTo(90 * seektime)
 
 	def seekFwd(self):
 		lookup = {
@@ -534,10 +555,12 @@ class InfoBarPVR:
 				self.SEEK_STATE_FF_4X: self.SEEK_STATE_FF_8X,
 				self.SEEK_STATE_FF_8X: self.SEEK_STATE_FF_32X,
 				self.SEEK_STATE_FF_32X: self.SEEK_STATE_FF_64X,
-				self.SEEK_STATE_FF_64X: self.SEEK_STATE_FF_64X,
+				self.SEEK_STATE_FF_64X: self.SEEK_STATE_FF_128X,
+				self.SEEK_STATE_FF_128X: self.SEEK_STATE_FF_128X,
 				self.SEEK_STATE_BACK_4X: self.SEEK_STATE_PLAY,
 				self.SEEK_STATE_BACK_32X: self.SEEK_STATE_BACK_4X,
 				self.SEEK_STATE_BACK_64X: self.SEEK_STATE_BACK_32X,
+				self.SEEK_STATE_BACK_128X: self.SEEK_STATE_BACK_64X,
 				self.SEEK_STATE_SM_HALF: self.SEEK_STATE_SM_HALF,
 				self.SEEK_STATE_SM_QUARTER: self.SEEK_STATE_SM_HALF,
 				self.SEEK_STATE_SM_EIGHTH: self.SEEK_STATE_SM_QUARTER
@@ -553,15 +576,19 @@ class InfoBarPVR:
 				self.SEEK_STATE_FF_8X: self.SEEK_STATE_FF_4X,
 				self.SEEK_STATE_FF_32X: self.SEEK_STATE_FF_8X,
 				self.SEEK_STATE_FF_64X: self.SEEK_STATE_FF_32X,
+				self.SEEK_STATE_FF_128X: self.SEEK_STATE_FF_64X,
 				self.SEEK_STATE_BACK_4X: self.SEEK_STATE_BACK_32X,
 				self.SEEK_STATE_BACK_32X: self.SEEK_STATE_BACK_64X,
-				self.SEEK_STATE_BACK_64X: self.SEEK_STATE_BACK_64X,
+				self.SEEK_STATE_BACK_64X: self.SEEK_STATE_BACK_128X,
+				self.SEEK_STATE_BACK_128X: self.SEEK_STATE_BACK_128X,
 				self.SEEK_STATE_SM_HALF: self.SEEK_STATE_SM_QUARTER,
 				self.SEEK_STATE_SM_QUARTER: self.SEEK_STATE_SM_EIGHTH,
 				self.SEEK_STATE_SM_EIGHTH: self.SEEK_STATE_PAUSE
 			}
 		self.setSeekState(lookup[self.seekstate]);
 
+from RecordTimer import parseEvent
+
 class InfoBarInstantRecord:
 	"""Instant Record - handles the instantRecord action in order to 
 	start/stop instant records"""
@@ -582,19 +609,25 @@ class InfoBarInstantRecord:
 			
 	def startInstantRecording(self):
 		serviceref = self.session.nav.getCurrentlyPlayingServiceReference()
-			
+		
 		# try to get event info
-		epg = None
+		event = None
 		try:
 			service = self.session.nav.getCurrentService()
 			info = service.info()
 			ev = info.getEvent(0)
-			epg = ev
+			event = ev
 		except:
 			pass
 		
+		if event is not None:
+			data = parseEvent(event)
+			data = (data[0], data[1] + 3600 * 10, data[2], data[3], data[4])
+		else:
+			data = (time.time(), time.time() + 3600 * 10, "instant record", "", None)
+		
 		# fix me, description. 
-		self.recording = self.session.nav.recordWithTimer(time.time(), time.time() + 3600, serviceref, epg, "instant record")
+		self.recording = self.session.nav.recordWithTimer(serviceref, *data)
 		self.recording.dontSave = True
 		
 		#self["BlinkingPoint"].setConnect(lambda: self.recording.isRunning())