X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fpython%2FScreens%2FInfoBarGenerics.py;h=df853218dc29f93b9a3351a3fd866e226c5f0776;hp=b27df9d319cc80792b433b3262188bb3455b982b;hb=da5e581c17f5e19d38c31d8b2c01b29fdd37fe78;hpb=7560beb3e371704d798259ca1ea927bf4575306c

diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py
index b27df9d..df85321 100644
--- a/lib/python/Screens/InfoBarGenerics.py
+++ b/lib/python/Screens/InfoBarGenerics.py
@@ -25,7 +25,6 @@ from Screens.TimerSelection import TimerSelection
 from Screens.PictureInPicture import PictureInPicture
 from Screens.SubtitleDisplay import SubtitleDisplay
 from Screens.RdsDisplay import RdsInfoDisplay, RassInteractive
-from Screens.SleepTimerEdit import SleepTimerEdit
 from Screens.TimeDateInput import TimeDateInput
 from ServiceReference import ServiceReference
 
@@ -692,8 +691,7 @@ class InfoBarSeek:
 				iPlayableService.evEOF: self.__evEOF,
 				iPlayableService.evSOF: self.__evSOF,
 			})
-
-		self.minSpeedBackward = useSeekBackHack and 16 or 0
+		self.fast_winding_hint_message_showed = False
 
 		class InfoBarSeekActionMap(HelpableActionMap):
 			def __init__(self, screen, *args, **kwargs):
@@ -741,24 +739,19 @@ class InfoBarSeek:
 		self.__seekableStatusChanged()
 
 	def makeStateForward(self, n):
-		minspeed = config.seek.stepwise_minspeed.value
-		repeat = int(config.seek.stepwise_repeat.value)
-		if minspeed != "Never" and n >= int(minspeed) and repeat > 1:
-			return (0, n * repeat, repeat, ">> %dx" % n)
-		else:
+#		minspeed = config.seek.stepwise_minspeed.value
+#		repeat = int(config.seek.stepwise_repeat.value)
+#		if minspeed != "Never" and n >= int(minspeed) and repeat > 1:
+#			return (0, n * repeat, repeat, ">> %dx" % n)
+#		else:
 			return (0, n, 0, ">> %dx" % n)
 
 	def makeStateBackward(self, n):
-		minspeed = config.seek.stepwise_minspeed.value
-		repeat = int(config.seek.stepwise_repeat.value)
-		if self.minSpeedBackward and n < self.minSpeedBackward:
-			r = (self.minSpeedBackward - 1)/ n + 1
-			if minspeed != "Never" and n >= int(minspeed) and repeat > 1:
-				r = max(r, repeat)
-			return (0, -n * r, r, "<< %dx" % n)
-		elif minspeed != "Never" and n >= int(minspeed) and repeat > 1:
-			return (0, -n * repeat, repeat, "<< %dx" % n)
-		else:
+#		minspeed = config.seek.stepwise_minspeed.value
+#		repeat = int(config.seek.stepwise_repeat.value)
+#		if minspeed != "Never" and n >= int(minspeed) and repeat > 1:
+#			return (0, -n * repeat, repeat, "<< %dx" % n)
+#		else:
 			return (0, -n, 0, "<< %dx" % n)
 
 	def makeStateSlowMotion(self, n):
@@ -825,6 +818,7 @@ class InfoBarSeek:
 #			print "seekable"
 
 	def __serviceStarted(self):
+		self.fast_winding_hint_message_showed = False
 		self.seekstate = self.SEEK_STATE_PLAY
 		self.__seekableStatusChanged()
 
@@ -878,7 +872,7 @@ class InfoBarSeek:
 			if config.seek.on_pause.value == "play":
 				self.unPauseService()
 			elif config.seek.on_pause.value == "step":
-				self.doSeekRelative(0)
+				self.doSeekRelative(1)
 			elif config.seek.on_pause.value == "last":
 				self.setSeekState(self.lastseekstate)
 				self.lastseekstate = self.SEEK_STATE_PLAY
@@ -915,6 +909,12 @@ class InfoBarSeek:
 			self.showAfterSeek()
 
 	def seekFwd(self):
+		seek = self.getSeek()
+		if seek and not (seek.isCurrentlySeekable() & 2):
+			if not self.fast_winding_hint_message_showed and (seek.isCurrentlySeekable() & 1):
+				self.session.open(MessageBox, _("No fast winding possible yet.. but you can use the number buttons to skip forward/backward!"), MessageBox.TYPE_INFO, timeout=10)
+				self.fast_winding_hint_message_showed = True
+			return
 		if self.seekstate == self.SEEK_STATE_PLAY:
 			self.setSeekState(self.makeStateForward(int(config.seek.enter_forward.value)))
 		elif self.seekstate == self.SEEK_STATE_PAUSE:
@@ -944,6 +944,12 @@ class InfoBarSeek:
 			self.setSeekState(self.makeStateSlowMotion(speed))
 
 	def seekBack(self):
+		seek = self.getSeek()
+		if seek and not (seek.isCurrentlySeekable() & 2):
+			if not self.fast_winding_hint_message_showed and (seek.isCurrentlySeekable() & 1):
+				self.session.open(MessageBox, _("No fast winding possible yet.. but you can use the number buttons to skip forward/backward!"), MessageBox.TYPE_INFO, timeout=10)
+				self.fast_winding_hint_message_showed = True
+			return
 		seekstate = self.seekstate
 		if seekstate == self.SEEK_STATE_PLAY:
 			self.setSeekState(self.makeStateBackward(int(config.seek.enter_backward.value)))
@@ -951,7 +957,7 @@ class InfoBarSeek:
 			self.setSeekState(self.makeStateBackward(int(config.seek.enter_backward.value)))
 			self.doSeekRelative(-6)
 		elif seekstate == self.SEEK_STATE_PAUSE:
-			self.doSeekRelative(-3)
+			self.doSeekRelative(-1)
 		elif self.isStateForward(seekstate):
 			speed = seekstate[1]
 			if seekstate[2]:
@@ -1358,17 +1364,6 @@ class InfoBarJobman:
 		job_manager.in_background = in_background
 
 # depends on InfoBarExtensions
-class InfoBarSleepTimer:
-	def __init__(self):
-		self.addExtension((self.getSleepTimerName, self.showSleepTimerSetup, lambda: True), "1")
-
-	def getSleepTimerName(self):
-		return _("Sleep Timer")
-
-	def showSleepTimerSetup(self):
-		self.session.open(SleepTimerEdit)
-
-# depends on InfoBarExtensions
 class InfoBarPiP:
 	def __init__(self):
 		try: