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

diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py
index c3c6e21a..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
@@ -1020,6 +1020,7 @@ class InfoBarExtensions:
 	PIPON = 0
 	PIPOFF = 1
 	MOVEPIP = 2
+	PIPSWAP = 3
 
 	def extensions(self):
 		list = []
@@ -1028,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)
 
@@ -1192,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)
@@ -1214,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:
@@ -1222,11 +1229,15 @@ 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])
-		del self.audio
+			self.audioTracks.selectTrack(audio[1])
+		del self.audioTracks
+#		del self.audioChannel
+#		del config.audio.audiochannel
 
 class InfoBarSubserviceSelection:
 	def __init__(self):
@@ -1399,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:
@@ -1408,7 +1423,6 @@ 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], *n[2], **n[3])