From: Felix Domke <tmbinc@elitedvb.net>
Date: Thu, 12 Feb 2009 15:49:17 +0000 (+0100)
Subject: Merge branch 'master' of /home/tmbinc/enigma2-git into tmbinc/FixTimingBugs
X-Git-Tag: 2.6.0~350^2~17
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/89a55fb89dbfb1d78255b48a50a8b4d28e83cdef?hp=-c

Merge branch 'master' of /home/tmbinc/enigma2-git into tmbinc/FixTimingBugs
---

89a55fb89dbfb1d78255b48a50a8b4d28e83cdef
diff --combined lib/python/Screens/InfoBarGenerics.py
index 89a6b8e3,3404e3f9..e64081e6
--- a/lib/python/Screens/InfoBarGenerics.py
+++ b/lib/python/Screens/InfoBarGenerics.py
@@@ -779,21 -779,12 +779,21 @@@ class InfoBarSeek
  			print "not pauseable."
  			state = self.SEEK_STATE_PLAY
  
 -		oldstate = self.seekstate
  		self.seekstate = state
  
 -		for i in range(3):
 -			if oldstate[i] != self.seekstate[i]:
 -				(self.session.nav.pause, pauseable.setFastForward, pauseable.setSlowMotion)[i](self.seekstate[i])
 +		if pauseable is not None:
 +			if self.seekstate[0]:
 +				print "resolved to PAUSE"
 +				pauseable.pause()
 +			elif self.seekstate[1]:
 +				print "resolved to FAST FORWARD"
 +				pauseable.setFastForward(self.seekstate[1])
 +			elif self.seekstate[2]:
 +				print "resolved to SLOW MOTION"
 +				pauseable.setSlowMotion(self.seekstate[2])
 +			else:
 +				print "resolved to PLAY"
 +				pauseable.unpause()
  
  		for c in self.onPlayStateChanged:
  			c(self.seekstate)
@@@ -1230,7 -1221,7 +1230,7 @@@ class InfoBarExtensions
  		self["InstantExtensionsActions"] = HelpableActionMap(self, "InfobarExtensions",
  			{
  				"extensions": (self.showExtensionSelection, _("view extensions...")),
- 			})
+ 			}, 1) # lower priority
  
  	def addExtension(self, extension, key = None, type = EXTENSION_SINGLE):
  		self.list.append((type, extension, key))