X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fpython%2FScreens%2FInfoBarGenerics.py;h=dab1c0fa359cca91bb91cd82b8210526fb9894f6;hp=6fa891122c9beb5621ed6a035b8d598875dfb0c7;hb=160fbbc42122524635b333b5edce3695bbce3b69;hpb=dd2f75a38c17459f1a3d46cf529a6b4fe3f7e3f2

diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py
index 6fa8911..dab1c0f 100644
--- a/lib/python/Screens/InfoBarGenerics.py
+++ b/lib/python/Screens/InfoBarGenerics.py
@@ -717,7 +717,7 @@ class InfoBarSeek:
 	SEEK_STATE_PAUSE = (1, 0, 0, "||")
 	SEEK_STATE_EOF = (1, 0, 0, "END")
 
-	def __init__(self, actionmap = "InfobarSeekActions", useSeekBackHack=True):
+	def __init__(self, actionmap = "InfobarSeekActions"):
 		self.__event_tracker = ServiceEventTracker(screen=self, eventmap=
 			{
 				iPlayableService.evSeekableStatusChanged: self.__seekableStatusChanged,
@@ -774,20 +774,10 @@ 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:
-			return (0, n, 0, ">> %dx" % n)
+		return (0, n, 0, ">> %dx" % n)
 
 	def makeStateBackward(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:
-			return (0, -n, 0, "<< %dx" % n)
+		return (0, -n, 0, "<< %dx" % n)
 
 	def makeStateSlowMotion(self, n):
 		return (0, 0, n, "/%d" % n)
@@ -1541,21 +1531,21 @@ class InfoBarInstantRecord:
 				self.session.nav.RecordTimer.record(recording)
 				self.recording.append(recording)
 		else:
-				simulTimerList = self.session.nav.RecordTimer.record(recording)
-				if simulTimerList is not None:	# conflict with other recording
-					name = simulTimerList[1].name
-					name_date = ' '.join((name, strftime('%c', localtime(simulTimerList[1].begin))))
-					print "[TIMER] conflicts with", name_date
-					recording.autoincrease = True	# start with max available length, then increment
-					if recording.setAutoincreaseEnd():
-						self.session.nav.RecordTimer.record(recording)
-						self.recording.append(recording)
-						self.session.open(MessageBox, _("Record time limited due to conflicting timer %s") % name_date, MessageBox.TYPE_INFO)
-					else:
-						self.session.open(MessageBox, _("Couldn't record due to conflicting timer %s") % name, MessageBox.TYPE_INFO)
-					recording.autoincrease = False
-				else:
+			simulTimerList = self.session.nav.RecordTimer.record(recording)
+			if simulTimerList is not None:	# conflict with other recording
+				name = simulTimerList[1].name
+				name_date = ' '.join((name, strftime('%c', localtime(simulTimerList[1].begin))))
+				print "[TIMER] conflicts with", name_date
+				recording.autoincrease = True	# start with max available length, then increment
+				if recording.setAutoincreaseEnd():
+					self.session.nav.RecordTimer.record(recording)
 					self.recording.append(recording)
+					self.session.open(MessageBox, _("Record time limited due to conflicting timer %s") % name_date, MessageBox.TYPE_INFO)
+				else:
+					self.session.open(MessageBox, _("Couldn't record due to conflicting timer %s") % name, MessageBox.TYPE_INFO)
+				recording.autoincrease = False
+			else:
+				self.recording.append(recording)
 
 	def isInstantRecordRunning(self):
 		print "self.recording:", self.recording
@@ -1970,20 +1960,21 @@ class InfoBarCueSheetSupport:
 		return True
 
 	def jumpPreviousMark(self):
-		# we add 2 seconds, so if the play position is <2s after
+		# we add 5 seconds, so if the play position is <5s after
 		# the mark, the mark before will be used
 		self.jumpPreviousNextMark(lambda x: -x-5*90000, start=True)
 
 	def jumpNextMark(self):
-		if not self.jumpPreviousNextMark(lambda x: x):
+		if not self.jumpPreviousNextMark(lambda x: x-90000):
 			self.doSeek(-1)
 
 	def getNearestCutPoint(self, pts, cmp=abs, start=False):
 		# can be optimized
-		beforecut = False
+		beforecut = True
 		nearest = None
+		bestdiff = -1
+		instate = True
 		if start:
-			beforecut = True
 			bestdiff = cmp(0 - pts)
 			if bestdiff >= 0:
 				nearest = [0, False]
@@ -1992,14 +1983,19 @@ class InfoBarCueSheetSupport:
 				beforecut = False
 				if cp[1] == self.CUT_TYPE_IN:  # Start is here, disregard previous marks
 					diff = cmp(cp[0] - pts)
-					if diff >= 0:
+					if start and diff >= 0:
 						nearest = cp
 						bestdiff = diff
 					else:
 						nearest = None
-			if cp[1] in (self.CUT_TYPE_MARK, self.CUT_TYPE_LAST):
+						bestdiff = -1
+			if cp[1] == self.CUT_TYPE_IN:
+				instate = True
+			elif cp[1] == self.CUT_TYPE_OUT:
+				instate = False
+			elif cp[1] in (self.CUT_TYPE_MARK, self.CUT_TYPE_LAST):
 				diff = cmp(cp[0] - pts)
-				if diff >= 0 and (nearest is None or bestdiff > diff):
+				if instate and diff >= 0 and (nearest is None or bestdiff > diff):
 					nearest = cp
 					bestdiff = diff
 		return nearest