X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/2601ee77efe1f10be7cbeb8af94e2fb229cc1ec1..5c644fbbceaa79a49501975de16b090771edee29:/lib/python/Screens/InfoBarGenerics.py

diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py
index 77c4a415..0fcb6ba9 100644
--- a/lib/python/Screens/InfoBarGenerics.py
+++ b/lib/python/Screens/InfoBarGenerics.py
@@ -254,7 +254,12 @@ class InfoBarNumberZap:
 
 	def keyNumberGlobal(self, number):
 #		print "You pressed number " + str(number)
-		self.session.openWithCallback(self.numberEntered, NumberZap, number)
+		if number == 0:
+			self.session.nav.zapLast()
+			self.instance.show()
+			self.show()
+		else:
+			self.session.openWithCallback(self.numberEntered, NumberZap, number)
 
 	def numberEntered(self, retval):
 #		print self.servicelist
@@ -451,12 +456,14 @@ class InfoBarPVR:
 	SEEK_STATE_FF_2X = (0, 2, 0, 0)
 	SEEK_STATE_FF_4X = (0, 4, 0, 0)
 	SEEK_STATE_FF_8X = (0, 8, 0, 0)
-	SEEK_STATE_FF_32X = (0, 0, 0, 32)
-	SEEK_STATE_FF_64X = (0, 0, 0, 64)
+	SEEK_STATE_FF_32X = (0, 4, 0, 32)
+	SEEK_STATE_FF_64X = (0, 4, 0, 64)
+	SEEK_STATE_FF_128X = (0, 4, 0, 128)
 	
 	SEEK_STATE_BACK_4X = (0, 0, 0, -4)
 	SEEK_STATE_BACK_32X = (0, 0, 0, -32)
 	SEEK_STATE_BACK_64X = (0, 0, 0, -64)
+	SEEK_STATE_BACK_128X = (0, 0, 0, -128)
 	
 	SEEK_STATE_SM_HALF = (0, 0, 2, 0)
 	SEEK_STATE_SM_QUARTER = (0, 0, 4, 0)
@@ -471,6 +478,9 @@ class InfoBarPVR:
 				
 				"seekFwd": (self.seekFwd, "skip forward"),
 				"seekBack": (self.seekBack, "skip backward"),
+							  
+				"up": (self.showMovies, "movie list"),
+				"down": (self.showMovies, "movie list")
 			})
 
 		self.seekstate = self.SEEK_STATE_PLAY
@@ -479,14 +489,24 @@ class InfoBarPVR:
 		self.skipinterval = 500 # 500ms skip interval
 		self.onClose.append(self.delSeekTimer)
 	
+	def up(self):
+		pass
+	
+	def down(self):
+		pass
+	
 	def delSeekTimer(self):
 		del self.seekTimer
 	
 	def seekTimerFired(self):
-		if self.skipmode > 0:
-			self.doSeek(+1, self.skipmode * self.skipinterval)
-		else:
-			self.doSeek(-1, -self.skipmode * self.skipinterval)
+		self.seekbase += self.skipmode * self.skipinterval
+		
+		# check if we bounced against the beginning of the file
+		if self.seekbase < 0:
+			self.seekbase = 0;
+			self.setSeekState(self.SEEK_STATE_PLAY)
+			
+		self.doSeek(self.seekbase)
 
 	def setSeekState(self, state):
 		oldstate = self.seekstate
@@ -509,14 +529,32 @@ class InfoBarPVR:
 			self.seekTimer.stop()
 		else:
 			self.seekTimer.start(500)
+		
+		service = self.session.nav.getCurrentService()
+		if service is None:
+			return
+		
+		seekable = service.seek()
+		if seekable is None:
+			return
+
+		if skipmode:
+			seekable.setTrickmode(1)
+		else:
+			seekable.setTrickmode(0)
+		
+		self.seekbase = seekable.getPlayPosition()[1] / 90
 	
 	def pauseService(self):
-		self.setSeekState(self.SEEK_STATE_PAUSE);
+		if (self.seekstate == self.SEEK_STATE_PAUSE):
+			self.unPauseService()
+		else:
+			self.setSeekState(self.SEEK_STATE_PAUSE);
 		
 	def unPauseService(self):
 		self.setSeekState(self.SEEK_STATE_PLAY);
 	
-	def doSeek(self, dir, seektime):
+	def doSeek(self, seektime):
 		service = self.session.nav.getCurrentService()
 		if service is None:
 			return
@@ -524,7 +562,7 @@ class InfoBarPVR:
 		seekable = service.seek()
 		if seekable is None:
 			return
-		seekable.seekRelative(dir, 90 * seektime)
+		seekable.seekTo(90 * seektime)
 
 	def seekFwd(self):
 		lookup = {
@@ -534,10 +572,12 @@ class InfoBarPVR:
 				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_64X: 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_4X: self.SEEK_STATE_PLAY,
 				self.SEEK_STATE_BACK_32X: self.SEEK_STATE_BACK_4X,
 				self.SEEK_STATE_BACK_64X: self.SEEK_STATE_BACK_32X,
+				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,
 				self.SEEK_STATE_SM_EIGHTH: self.SEEK_STATE_SM_QUARTER
@@ -553,9 +593,11 @@ class InfoBarPVR:
 				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_128X: self.SEEK_STATE_FF_64X,
 				self.SEEK_STATE_BACK_4X: self.SEEK_STATE_BACK_32X,
 				self.SEEK_STATE_BACK_32X: self.SEEK_STATE_BACK_64X,
-				self.SEEK_STATE_BACK_64X: 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
@@ -672,17 +714,9 @@ class InfoBarSubserviceSelection:
 
 class InfoBarAdditionalInfo:
 	def __init__(self):
-		self["DolbyActive"] = PixmapConditional()
-		# TODO: get the info from c++ somehow
-		self["DolbyActive"].setConnect(lambda: False)
-		
-		self["CryptActive"] = PixmapConditional()
-		# TODO: get the info from c++ somehow
-		self["CryptActive"].setConnect(lambda: False)
-		
-		self["FormatActive"] = PixmapConditional()
-		# TODO: get the info from c++ somehow
-		self["FormatActive"].setConnect(lambda: False)
+		self["DolbyActive"] = Pixmap()
+		self["CryptActive"] = Pixmap()
+		self["FormatActive"] = Pixmap()
 		
 		self["ButtonRed"] = PixmapConditional(withTimer = False)
 		self["ButtonRed"].setConnect(lambda: harddiskmanager.HDDCount() > 0)
@@ -690,18 +724,79 @@ class InfoBarAdditionalInfo:
 		self["ButtonRedText"] = LabelConditional(text = _("Record"), withTimer = False)
 		self["ButtonRedText"].setConnect(lambda: harddiskmanager.HDDCount() > 0)
 		self.onShown.append(self["ButtonRedText"].update)
-				
-		self["ButtonGreen"] = PixmapConditional()
-		self["ButtonGreen"].setConnect(lambda: self.session.nav.getCurrentService().subServices().getNumberOfSubservices() > 0)
-		self["ButtonGreenText"] = LabelConditional(text = _("Subservices"))
-		self["ButtonGreenText"].setConnect(lambda: self.session.nav.getCurrentService().subServices().getNumberOfSubservices() > 0)
 
-		self["ButtonYellow"] = PixmapConditional()
+		self["ButtonGreen"] = Pixmap()
+		self["ButtonGreenText"] = Label(_("Subservices"))
+
+		self["ButtonYellow"] = PixmapConditional(withTimer = False)
 		self["ButtonYellow"].setConnect(lambda: False)
 
-		self["ButtonBlue"] = PixmapConditional()
+		self["ButtonBlue"] = PixmapConditional(withTimer = False)
 		self["ButtonBlue"].setConnect(lambda: False)
 
+		self.session.nav.event.append(self.gotServiceEvent) # we like to get service events
+
+	def hideSubServiceIndication(self):
+		self["ButtonGreen"].hideWidget()
+		self["ButtonGreenText"].hide()
+
+	def showSubServiceIndication(self):
+		self["ButtonGreen"].showWidget()
+		self["ButtonGreenText"].show()
+
+	def checkFormat(self, service):
+		info = service.info()
+		if info is not None:
+			aspect = info.getInfo(iServiceInformation.sAspect)
+			if aspect in [ 3, 4, 7, 8, 0xB, 0xC, 0xF, 0x10 ]:
+				self["FormatActive"].showWidget()
+			else:
+				self["FormatActive"].hideWidget()
+
+	def checkSubservices(self, service):
+		if service.subServices().getNumberOfSubservices() > 0:
+			self.showSubServiceIndication()
+		else:
+			self.hideSubServiceIndication()
+
+	def checkDolby(self, service):
+		dolby = False
+		audio = service.audioTracks()
+		if audio is not None:
+			n = audio.getNumberOfTracks()
+			for x in range(n):
+				i = audio.getTrackInfo(x)
+				description = i.getDescription();
+				if description.find("AC3") != -1 or description.find("DTS") != -1:
+					dolby = True
+					break
+		if dolby:
+			self["DolbyActive"].showWidget()
+		else:
+			self["DolbyActive"].hideWidget()
+
+	def checkCrypted(self, service):
+		info = service.info()
+		if info is not None:
+			if info.getInfo(iServiceInformation.sIsCrypted) > 0:
+				self["CryptActive"].showWidget()
+			else:
+				self["CryptActive"].hideWidget()
+
+	def gotServiceEvent(self, ev):
+		service = self.session.nav.getCurrentService()
+		if ev == pNavigation.evUpdatedEventInfo:
+			self.checkSubservices(service)
+			self.checkFormat(service)
+		elif ev == pNavigation.evUpdatedInfo:
+			self.checkCrypted(service)
+			self.checkDolby(service)
+		elif ev == pNavigation.evStopService:
+			self.hideSubServiceIndication()
+			self["CryptActive"].hideWidget()
+			self["DolbyActive"].hideWidget()
+			self["FormatActive"].hideWidget()
+
 class InfoBarNotifications:
 	def __init__(self):
 		self.onExecBegin.append(self.checkNotifications)