From d511f48bb79c6acd0643e0cf44c5c1ef677df20f Mon Sep 17 00:00:00 2001
From: Felix Domke <tmbinc@elitedvb.net>
Date: Tue, 26 Jun 2007 23:11:57 +0000
Subject: [PATCH] use 'l'-flag for seekBackManual, and remove timer

---
 data/keymap.xml                       | 16 ++++----
 lib/python/Screens/InfoBarGenerics.py | 53 ++-------------------------
 2 files changed, 12 insertions(+), 57 deletions(-)

diff --git a/data/keymap.xml b/data/keymap.xml
index 21643fa4..52a6266a 100644
--- a/data/keymap.xml
+++ b/data/keymap.xml
@@ -216,18 +216,18 @@
 		<device name="dreambox remote control (native)">
 			<key id="KEY_YELLOW" mapto="pauseService" flags="m" />
 			<key id="KEY_GREEN" mapto="unPauseService" flags="m" />
-			<key id="KEY_RED" mapto="seekBackDown" flags="m" />
-			<key id="KEY_RED" mapto="seekBackUp" flags="b" />
-			<key id="KEY_BLUE" mapto="seekFwdDown" flags="m" />
-			<key id="KEY_BLUE" mapto="seekFwdUp" flags="b" />
+			<key id="KEY_RED" mapto="seekBack" flags="b" />
+			<key id="KEY_BLUE" mapto="seekFwd" flags="b" />
+			<key id="KEY_RED" mapto="seekBackManual" flags="l" />
+			<key id="KEY_BLUE" mapto="seekFwdManual" flags="l" />
 		</device>
 		<device name="dreambox advanced remote control (native)">
 			<key id="KEY_PLAY" mapto="playpauseService" flags="m" />
 			<!--key id="KEY_GREEN" mapto="unPauseService" flags="m" /-->
-			<key id="KEY_PREVIOUSSONG" mapto="seekBackDown" flags="m" />
-			<key id="KEY_PREVIOUSSONG" mapto="seekBackUp" flags="b" />
-			<key id="KEY_NEXTSONG" mapto="seekFwdDown" flags="m" />
-			<key id="KEY_NEXTSONG" mapto="seekFwdUp" flags="b" />
+			<key id="KEY_PREVIOUSSONG" mapto="seekBack" flags="b" />
+			<key id="KEY_NEXTSONG" mapto="seekFwd" flags="b" />
+			<key id="KEY_PREVIOUSSONG" mapto="seekBackManual" flags="l" />
+			<key id="KEY_NEXTSONG" mapto="seekFwdManual" flags="l" />
 		</device>
 		
 		<key id="KEY_LEFT" mapto="seekBack" flags="m" />
diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py
index e12d2f18..52a96e46 100644
--- a/lib/python/Screens/InfoBarGenerics.py
+++ b/lib/python/Screens/InfoBarGenerics.py
@@ -651,26 +651,15 @@ class InfoBarSeek:
 				"unPauseService": (self.unPauseService, _("continue")),
 
 				"seekFwd": (self.seekFwd, _("skip forward")),
-				"seekFwdDown": self.seekFwdDown,
-				"seekFwdUp": self.seekFwdUp,
+				"seekFwdManual": (self.seekFwdManual, _("skip forward (enter time)")),
 				"seekBack": (self.seekBack, _("skip backward")),
-				"seekBackDown": self.seekBackDown,
-				"seekBackUp": self.seekBackUp,
+				"seekBackManual": (self.seekBackManual, _("skip backward (enter time)")),
 			}, prio=-1)
 			# give them a little more priority to win over color buttons
 
 		self["SeekActions"].setEnabled(False)
 
 		self.seekstate = self.SEEK_STATE_PLAY
-		self.onClose.append(self.delTimer)
-
-		self.fwdtimer = False
-		self.fwdKeyTimer = eTimer()
-		self.fwdKeyTimer.timeout.get().append(self.fwdTimerFire)
-
-		self.rwdtimer = False
-		self.rwdKeyTimer = eTimer()
-		self.rwdKeyTimer.timeout.get().append(self.rwdTimerFire)
 
 		self.onPlayStateChanged = [ ]
 
@@ -684,10 +673,6 @@ class InfoBarSeek:
 	def down(self):
 		pass
 
-	def delTimer(self):
-		del self.fwdKeyTimer
-		del self.rwdKeyTimer
-
 	def getSeek(self):
 		service = self.session.nav.getCurrentService()
 		if service is None:
@@ -785,23 +770,6 @@ class InfoBarSeek:
 
 		seekable.seekTo(90 * seektime)
 
-	def seekFwdDown(self):
-		print "start fwd timer"
-		self.fwdtimer = True
-		self.fwdKeyTimer.start(1000)
-
-	def seekBackDown(self):
-		print "start rewind timer"
-		self.rwdtimer = True
-		self.rwdKeyTimer.start(1000)
-
-	def seekFwdUp(self):
-		print "seekFwdUp"
-		if self.fwdtimer:
-			self.fwdKeyTimer.stop()
-			self.fwdtimer = False
-			self.seekFwd()
-
 	def seekFwd(self):
 		lookup = {
 				self.SEEK_STATE_PLAY: self.SEEK_STATE_FF_2X,
@@ -823,13 +791,6 @@ class InfoBarSeek:
 			}
 		self.setSeekState(lookup[self.seekstate])
 
-	def seekBackUp(self):
-		print "seekBackUp"
-		if self.rwdtimer:
-			self.rwdKeyTimer.stop()
-			self.rwdtimer = False
-			self.seekBack()
-
 	def seekBack(self):
 		lookup = {
 				self.SEEK_STATE_PLAY: self.SEEK_STATE_BACK_16X,
@@ -856,10 +817,7 @@ class InfoBarSeek:
 			if seekable is not None:
 				seekable.seekRelative(-1, 3)
 
-	def fwdTimerFire(self):
-		print "Display seek fwd"
-		self.fwdKeyTimer.stop()
-		self.fwdtimer = False
+	def seekFwdManual(self):
 		self.session.openWithCallback(self.fwdSeekTo, MinuteInput)
 
 	def fwdSeekTo(self, minutes):
@@ -869,10 +827,7 @@ class InfoBarSeek:
 			if seekable is not None:
 				seekable.seekRelative(1, minutes * 60 * 90000)
 
-	def rwdTimerFire(self):
-		print "rwdTimerFire"
-		self.rwdKeyTimer.stop()
-		self.rwdtimer = False
+	def seekBackManual(self):
 		self.session.openWithCallback(self.rwdSeekTo, MinuteInput)
 
 	def rwdSeekTo(self, minutes):
-- 
2.30.2