X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/9ce6ca4f63e908ef0ed64c3cf9d02ed307c2da46..afe7d8cacb1875f0e86a9f970dac9280dba20462:/lib/python/Screens/InfoBarGenerics.py

diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py
index fd2e0e95..3320d23d 100644
--- a/lib/python/Screens/InfoBarGenerics.py
+++ b/lib/python/Screens/InfoBarGenerics.py
@@ -613,12 +613,16 @@ class InfoBarSeek:
 	SEEK_STATE_FF_2X = (0, 2, 0, ">> 2x")
 	SEEK_STATE_FF_4X = (0, 4, 0, ">> 4x")
 	SEEK_STATE_FF_8X = (0, 8, 0, ">> 8x")
+	SEEK_STATE_FF_16X = (0, 16, 0, ">> 16x")
 	SEEK_STATE_FF_32X = (0, 32, 0, ">> 32x")
+	SEEK_STATE_FF_48X = (0, 48, 0, ">> 48x")
 	SEEK_STATE_FF_64X = (0, 64, 0, ">> 64x")
 	SEEK_STATE_FF_128X = (0, 128, 0, ">> 128x")
 
+	SEEK_STATE_BACK_8X = (0, -8, 0, "<< 8x")
 	SEEK_STATE_BACK_16X = (0, -16, 0, "<< 16x")
 	SEEK_STATE_BACK_32X = (0, -32, 0, "<< 32x")
+	SEEK_STATE_BACK_48X = (0, -48, 0, "<< 48x")
 	SEEK_STATE_BACK_64X = (0, -64, 0, "<< 64x")
 	SEEK_STATE_BACK_128X = (0, -128, 0, "<< 128x")
 
@@ -648,7 +652,8 @@ class InfoBarSeek:
 				if action[:5] == "seek:":
 					time = int(action[5:])
 					self.screen.seekRelative(time * 90000)
-					self.screen.showAfterSeek()
+					if config.usage.show_infobar_on_skip.value:
+						self.screen.showAfterSeek()
 					return 1
 				else:
 					return HelpableActionMap.action(self, contexts, action)
@@ -794,13 +799,17 @@ class InfoBarSeek:
 				self.SEEK_STATE_PAUSE: self.SEEK_STATE_SM_EIGHTH,
 				self.SEEK_STATE_FF_2X: self.SEEK_STATE_FF_4X,
 				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_8X: self.SEEK_STATE_FF_16X,
+				self.SEEK_STATE_FF_16X: self.SEEK_STATE_FF_32X,
+				self.SEEK_STATE_FF_32X: self.SEEK_STATE_FF_48X,
+				self.SEEK_STATE_FF_48X: 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_16X: self.SEEK_STATE_PLAY,
+				self.SEEK_STATE_BACK_8X: self.SEEK_STATE_PLAY,
+				self.SEEK_STATE_BACK_16X: self.SEEK_STATE_BACK_8X,
 				self.SEEK_STATE_BACK_32X: self.SEEK_STATE_BACK_16X,
-				self.SEEK_STATE_BACK_64X: self.SEEK_STATE_BACK_32X,
+				self.SEEK_STATE_BACK_48X: self.SEEK_STATE_BACK_32X,
+				self.SEEK_STATE_BACK_64X: self.SEEK_STATE_BACK_48X,
 				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,
@@ -811,22 +820,26 @@ class InfoBarSeek:
 
 	def seekBack(self):
 		lookup = {
-				self.SEEK_STATE_PLAY: self.SEEK_STATE_BACK_16X,
+				self.SEEK_STATE_PLAY: self.SEEK_STATE_BACK_8X,
 				self.SEEK_STATE_PAUSE: self.SEEK_STATE_PAUSE,
 				self.SEEK_STATE_FF_2X: self.SEEK_STATE_PLAY,
 				self.SEEK_STATE_FF_4X: self.SEEK_STATE_FF_2X,
 				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_16X: self.SEEK_STATE_FF_8X,
+				self.SEEK_STATE_FF_32X: self.SEEK_STATE_FF_16X,
+				self.SEEK_STATE_FF_48X: self.SEEK_STATE_FF_32X,
+				self.SEEK_STATE_FF_64X: self.SEEK_STATE_FF_48X,
 				self.SEEK_STATE_FF_128X: self.SEEK_STATE_FF_64X,
+				self.SEEK_STATE_BACK_8X: self.SEEK_STATE_BACK_16X,
 				self.SEEK_STATE_BACK_16X: self.SEEK_STATE_BACK_32X,
-				self.SEEK_STATE_BACK_32X: self.SEEK_STATE_BACK_64X,
+				self.SEEK_STATE_BACK_32X: self.SEEK_STATE_BACK_48X,
+				self.SEEK_STATE_BACK_48X: 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.SEEK_STATE_EOF: self.SEEK_STATE_BACK_16X,
+				self.SEEK_STATE_EOF: self.SEEK_STATE_BACK_8X,
 			}
 		self.setSeekState(lookup[self.seekstate])
 
@@ -871,7 +884,7 @@ class InfoBarSeek:
 	def checkSkipShowHideLock(self):
 		wantlock = self.seekstate != self.SEEK_STATE_PLAY
 
-		if config.usage.show_infobar_on_zap.value:
+		if config.usage.show_infobar_on_skip.value:
 			if self.lockedBecauseOfSkipping and not wantlock:
 				self.unlockShow()
 				self.lockedBecauseOfSkipping = False
@@ -1468,7 +1481,6 @@ class InfoBarAudioSelection:
 		n = audio and audio.getNumberOfTracks() or 0
 		keys = [ "red", "", "1", "2", "3", "4", "5", "6", "7", "8", "9", "0"] + [""]*n
 		tlist = []
-		print "tlist:", tlist
 		if n > 0:
 			self.audioChannel = service.audioChannel()
 
@@ -1487,8 +1499,8 @@ class InfoBarAudioSelection:
 
 				tlist.append((description, x))
 
-			selectedAudio = tlist[0][1]
-			tlist.sort(lambda x,y : cmp(x[0], y[0]))
+			selectedAudio = audio.getCurrentTrack()
+			tlist.sort(key=lambda x: x[0])
 
 			selection = 2
 			for x in tlist: