X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/4e8cae716ad3fdf29a7b2a45e5eec0a530f93277..377d4210692cf494933638cce3b21da3189fb613:/lib/python/Screens/InfoBarGenerics.py

diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py
index 67212656..2f7b36c3 100644
--- a/lib/python/Screens/InfoBarGenerics.py
+++ b/lib/python/Screens/InfoBarGenerics.py
@@ -30,6 +30,7 @@ from Screens.MessageBox import MessageBox
 from Screens.MinuteInput import MinuteInput
 from Screens.TimerSelection import TimerSelection
 from Screens.PictureInPicture import PictureInPicture
+from Screens.SubtitleDisplay import SubtitleDisplay
 from ServiceReference import ServiceReference
 
 from Tools import Notifications
@@ -1020,6 +1021,7 @@ class InfoBarExtensions:
 	PIPON = 0
 	PIPOFF = 1
 	MOVEPIP = 2
+	PIPSWAP = 3
 
 	def extensions(self):
 		list = []
@@ -1028,29 +1030,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)
 
@@ -1408,6 +1411,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:
@@ -1417,7 +1424,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])
@@ -1595,3 +1601,40 @@ class InfoBarTeletextPlugin:
 
 	def startTeletext(self):
 		self.teletext_plugin(session=self.session, service=self.session.nav.getCurrentService())
+
+class InfoBarSubtitleSupport(object):
+	def __init__(self):
+		object.__init__(self)
+		self.subtitle_window = self.session.instantiateDialog(SubtitleDisplay)
+		self.__subtitles_enabled = False
+
+		self.__event_tracker = ServiceEventTracker(screen=self, eventmap=
+			{
+				iPlayableService.evStart: self.__serviceStarted,
+			})
+
+	def __serviceStarted(self):
+		# reenable if it was enabled
+		r = self.__subtitles_enabled
+		self.__subtitles_enabled = False
+		self.setSubtitlesEnable(r)
+
+	def getCurrentServiceSubtitle(self):
+		service = self.session.nav.getCurrentService()
+		return service and service.subtitle()
+	
+	def setSubtitlesEnable(self, enable=True):
+		subtitle = self.getCurrentServiceSubtitle()
+		if enable:
+			if subtitle and not self.__subtitles_enabled:
+				subtitle.enableSubtitles(self.subtitle_window.instance, 0)
+				self.subtitle_window.show()
+				self.__subtitles_enabled = True
+		else:
+			if subtitle:
+				subtitle.disableSubtitles(self.subtitle_window.instance)
+
+			self.subtitle_window.hide()
+			self.__subtitles_enabled = False
+		
+	subtitlesEnabled = property(lambda self: self.__subtitlesEnabled, setSubtitlesEnable)