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

diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py
index c7076225..9e998d05 100644
--- a/lib/python/Screens/InfoBarGenerics.py
+++ b/lib/python/Screens/InfoBarGenerics.py
@@ -13,7 +13,7 @@ from Components.PluginComponent import plugins
 from Components.ProgressBar import *
 from Components.ServiceEventTracker import ServiceEventTracker
 from Components.ServiceName import ServiceName
-from Components.config import config, configElement, ConfigSubsection, configSequence, configElementBoolean
+from Components.config import config, configElement, ConfigSubsection, configSequence, configElementBoolean, configSelection, configElement_nonSave, getConfigListEntry
 from Components.config import configfile, configsequencearg
 from Components.TimerList import TimerEntryComponent
 from Components.TunerInfo import TunerInfo
@@ -265,7 +265,7 @@ class InfoBarChannelSelection:
 		config.misc.initialchannelselection.value = 0
 		config.misc.initialchannelselection.save()
 		self.switchChannelDown()
-		
+
 	def historyBack(self):
 		self.servicelist.historyBack()
 
@@ -448,7 +448,8 @@ class InfoBarEPG:
 		if self.is_now_next and len(self.dlg_stack) == 1:
 			self.getNowNext()
 			assert self.eventView
-			self.eventView.setEvent(self.epglist[0])
+			if len(self.epglist):
+				self.eventView.setEvent(self.epglist[0])
 
 	def openEventView(self):
 		ref = self.session.nav.getCurrentlyPlayingServiceReference()
@@ -1019,6 +1020,7 @@ class InfoBarExtensions:
 	PIPON = 0
 	PIPOFF = 1
 	MOVEPIP = 2
+	PIPSWAP = 3
 
 	def extensions(self):
 		list = []
@@ -1027,29 +1029,30 @@ class InfoBarExtensions:
 		elif self.pipshown == True:
 			list.append((_("Disable Picture in Picture"), self.PIPOFF))
 			list.append((_("Move Picture in Picture"), self.MOVEPIP))
+			list.append((_("Swap services"), self.PIPSWAP))
 		self.session.openWithCallback(self.extensionCallback, ChoiceBox, title=_("Please choose an extension..."), list = list)
 
 	def extensionCallback(self, answer):
 		if answer is not None:
 			if answer[1] == self.PIPON:
-#				self.session.nav.stopService()
 				self.pip = self.session.instantiateDialog(PictureInPicture)
-				#self.pip.show()
 				
 				newservice = self.session.nav.getCurrentlyPlayingServiceReference()
-				self.pipservice = eServiceCenter.getInstance().play(newservice)
-				if self.pipservice and not self.pipservice.setTarget(1):
-					self.pipservice.start()
+				
+				if self.pip.playService(newservice):
 					self.pipshown = True
 				else:
-					self.pipservice = None
+					self.pipshown = False
 					del self.pip
 				self.session.nav.playService(newservice)
 			elif answer[1] == self.PIPOFF:
-				#self.pip.hide()
-				self.pipservice = None
 				del self.pip
 				self.pipshown = False
+			elif answer[1] == self.PIPSWAP:
+				swapservice = self.pip.getCurrentService()
+				self.pip.playService(self.session.nav.getCurrentlyPlayingServiceReference())
+				self.session.nav.playService(swapservice)
+				
 			elif answer[1] == self.MOVEPIP:
 				self.session.open(PiPSetup, pip = self.pip)
 
@@ -1191,9 +1194,11 @@ class InfoBarAudioSelection:
 	def audioSelection(self):
 		service = self.session.nav.getCurrentService()
 		audio = service.audioTracks()
-		self.audio = audio
+		self.audioTracks = audio
 		n = audio.getNumberOfTracks()
 		if n > 0:
+#			self.audioChannel = service.audioChannel()
+#			config.audio.audiochannel = configElement_nonSave("config.audio.audiochannel", configSelection, self.audioChannel.getCurrentChannel(), (("left", _("Left  >")), ("stereo", _("<  Stereo  >")), ("right", _("<  Right"))))
 			tlist = []
 			for x in range(n):
 				i = audio.getTrackInfo(x)
@@ -1213,6 +1218,9 @@ class InfoBarAudioSelection:
 			
 			selectedAudio = tlist[0][1]
 			tlist.sort(lambda x,y : cmp(x[0], y[0]))
+
+#			tlist.insert(0, getConfigListEntry(_("Audio Channel"), config.audio.audiochannel))
+
 			selection = 0
 			for x in tlist:
 				if x[1] != selectedAudio:
@@ -1221,18 +1229,67 @@ class InfoBarAudioSelection:
 					break
 			
 			self.session.openWithCallback(self.audioSelected, ChoiceBox, title=_("Select audio track"), list = tlist, selection = selection)
+		else:
+			del self.audioTracks
 
 	def audioSelected(self, audio):
 		if audio is not None:
-			self.audio.selectTrack(audio[1])
+			self.audioTracks.selectTrack(audio[1])
+		del self.audioTracks
+#		del self.audioChannel
+#		del config.audio.audiochannel
 
 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.checkSubservicesAvail) # we like to get service events
+
+	def checkSubservicesAvail(self, ev):
+		if ev == iPlayableService.evUpdatedEventInfo:
+			service = self.session.nav.getCurrentService()
+			subservices = service.subServices()
+			if subservices.getNumberOfSubservices() == 0:
+				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():
+					del subservices
+					del service
+					self.session.nav.playService(newservice)
+
 	def subserviceSelection(self):
 		service = self.session.nav.getCurrentService()
 		subservices = service.subServices()
@@ -1252,6 +1309,7 @@ class InfoBarSubserviceSelection:
 
 	def subserviceSelected(self, service):
 		if not service is None:
+			self["SubserviceQuickzapAction"].setEnabled(True)
 			self.session.nav.playService(service[1])
 
 class InfoBarAdditionalInfo:
@@ -1352,6 +1410,10 @@ class InfoBarNotifications:
 	def __init__(self):
 		self.onExecBegin.append(self.checkNotifications)
 		Notifications.notificationAdded.append(self.checkNotificationsIfExecing)
+		self.onClose.append(self.__removeNotification)
+	
+	def __removeNotification(self):
+		Notifications.notificationAdded.remove(self.checkNotificationsIfExecing)
 	
 	def checkNotificationsIfExecing(self):
 		if self.execing:
@@ -1361,12 +1423,11 @@ class InfoBarNotifications:
 		if len(Notifications.notifications):
 			n = Notifications.notifications[0]
 			Notifications.notifications = Notifications.notifications[1:]
-			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):