X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/39708e44b6f6fd25fd3e02ae119351bdebadbfb5..cad37d2b523b91a00a58a9f53e0ba9bc7913c500:/lib/python/Screens/InfoBarGenerics.py

diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py
index c7076225..d621d12e 100644
--- a/lib/python/Screens/InfoBarGenerics.py
+++ b/lib/python/Screens/InfoBarGenerics.py
@@ -265,7 +265,7 @@ class InfoBarChannelSelection:
 		config.misc.initialchannelselection.value = 0
 		config.misc.initialchannelselection.save()
 		self.switchChannelDown()
-		
+
 	def historyBack(self):
 		self.servicelist.historyBack()
 
@@ -1225,14 +1225,58 @@ class InfoBarAudioSelection:
 	def audioSelected(self, audio):
 		if audio is not None:
 			self.audio.selectTrack(audio[1])
+		del self.audio
 
 class InfoBarSubserviceSelection:
 	def __init__(self):
 		self["SubserviceSelectionAction"] = HelpableActionMap(self, "InfobarSubserviceSelectionActions",
 			{
-				"subserviceSelection": (self.subserviceSelection, "Subservice list..."),
+				"subserviceSelection": (self.subserviceSelection, _("Subservice list...")),
 			})
 
+		self["SubserviceQuickzapAction"] = HelpableActionMap(self, "InfobarSubserviceQuickzapActions",
+			{
+				"nextSubservice": (self.nextSubservice, _("Switch to next subservice")),
+				"prevSubservice": (self.prevSubservice, _("Switch to previous subservice"))
+			}, -1)
+		self["SubserviceQuickzapAction"].setEnabled(False)
+
+		self.session.nav.event.append(self.checkParentAvail) # we like to get service events
+
+	def checkParentAvail(self, ev):
+		ref=self.session.nav.getCurrentlyPlayingServiceReference()
+		if ev == iPlayableService.evUpdatedEventInfo:
+			if ref.getData(5):
+				self["SubserviceQuickzapAction"].setEnabled(True)
+			else:
+				self["SubserviceQuickzapAction"].setEnabled(False)
+
+	def nextSubservice(self):
+		self.changeSubservice(+1)
+
+	def prevSubservice(self):
+		self.changeSubservice(-1)
+
+	def changeSubservice(self, direction):
+		service = self.session.nav.getCurrentService()
+		subservices = service.subServices()
+		n = subservices.getNumberOfSubservices()
+		if n > 0:
+			selection = -1
+			ref = self.session.nav.getCurrentlyPlayingServiceReference()
+			for x in range(n):
+				if subservices.getSubservice(x).toString() == ref.toString():
+					selection = x
+			if selection != -1:
+				selection += direction
+				if selection >= n:
+					selection=0
+				elif selection < 0:
+					selection=n-1
+				newservice = subservices.getSubservice(selection)
+				if newservice.valid():
+					self.session.nav.playService(newservice)
+
 	def subserviceSelection(self):
 		service = self.session.nav.getCurrentService()
 		subservices = service.subServices()
@@ -1364,9 +1408,9 @@ class InfoBarNotifications:
 			print "open",n
 			cb = n[0]
 			if cb is not None:
-				self.session.openWithCallback(cb, *n[1:])
+				self.session.openWithCallback(cb, n[1], *n[2], **n[3])
 			else:
-				self.session.open(*n[1:])
+				self.session.open(n[1], *n[2], **n[3])
 
 class InfoBarServiceNotifications:
 	def __init__(self):