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

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

544e1af49c6c1c25a3ef97b27ac3e6764a008824
diff --combined lib/python/Screens/InfoBarGenerics.py
index e64081e6,627a53d2..6e28f84a
--- 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)
@@@ -1305,7 -1296,10 +1305,10 @@@ class InfoBarPlugins
  		return list
  
  	def runPlugin(self, plugin):
- 		plugin(session = self.session, servicelist = self.servicelist)
+ 		if isinstance(self, InfoBarChannelSelection):
+ 			plugin(session = self.session, servicelist = self.servicelist)
+ 		else:
+ 			plugin(session = self.session)
  
  from Components.Task import job_manager
  class InfoBarJobman: