X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=lib%2Fpython%2FScreens%2FInfoBarGenerics.py;h=528bca2e3bce0d2b023cadc7199472e7642fd393;hb=9fe975821792486e21350b365217717ed29ca9bb;hp=13bca8d146bcc9b86c65dc782469fb26d8bba005;hpb=5e57d6b68efa092a6a85fdee2c6904c6bd473905;p=vuplus_dvbapp

diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py
index 13bca8d..528bca2 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
@@ -257,7 +258,8 @@ class InfoBarChannelSelection:
 				"zapUp": (self.zapUp, _("previous channel")),
 				"zapDown": (self.zapDown, _("next channel")),
 				"historyBack": (self.historyBack, _("previous channel in history")),
-				"historyNext": (self.historyNext, _("next channel in history"))
+				"historyNext": (self.historyNext, _("next channel in history")),
+				"openServiceList": (self.openServiceList, _("open service list")),
 			})
 
 	def firstRun(self):
@@ -279,6 +281,9 @@ class InfoBarChannelSelection:
 	def switchChannelDown(self):
 		self.servicelist.moveDown()
 		self.session.execDialog(self.servicelist)
+	
+	def openServiceList(self):
+		self.session.execDialog(self.servicelist)
 
 	def zapUp(self):
 		if currentConfigSelectionElement(config.usage.quickzap_bouquet_change) == "yes":
@@ -680,6 +685,8 @@ class InfoBarSeek:
 		
 	def unPauseService(self):
 		print "unpause"
+		if self.seekstate == self.SEEK_STATE_PLAY:
+			return 0
 		self.setSeekState(self.SEEK_STATE_PLAY);
 	
 	def doSeek(self, seektime):
@@ -1021,6 +1028,7 @@ class InfoBarExtensions:
 	PIPOFF = 1
 	MOVEPIP = 2
 	PIPSWAP = 3
+	ENABLE_SUBTITLE = 4
 
 	def extensions(self):
 		list = []
@@ -1030,6 +1038,13 @@ class InfoBarExtensions:
 			list.append((_("Disable Picture in Picture"), self.PIPOFF))
 			list.append((_("Move Picture in Picture"), self.MOVEPIP))
 			list.append((_("Swap services"), self.PIPSWAP))
+		
+		s = self.getCurrentServiceSubtitle()
+		l = s and s.getSubtitleList() or [ ]
+		
+		for x in l:
+			list.append(("DEBUG: Enable Subtitles: " + x[0], self.ENABLE_SUBTITLE, x[1]))
+		
 		self.session.openWithCallback(self.extensionCallback, ChoiceBox, title=_("Please choose an extension..."), list = list)
 
 	def extensionCallback(self, answer):
@@ -1055,6 +1070,9 @@ class InfoBarExtensions:
 				
 			elif answer[1] == self.MOVEPIP:
 				self.session.open(PiPSetup, pip = self.pip)
+			elif answer[1] == self.ENABLE_SUBTITLE:
+				self.selected_subtitle = answer[2]
+				self.subtitles_enabled = True
 
 from RecordTimer import parseEvent
 
@@ -1410,6 +1428,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:
@@ -1419,7 +1441,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])
@@ -1597,3 +1618,50 @@ 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.__selected_subtitle = None
+		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 and self.__selected_subtitle:
+			if subtitle and not self.__subtitles_enabled:
+				subtitle.enableSubtitles(self.subtitle_window.instance, self.selected_subtitle)
+				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
+
+	def setSelectedSubtitle(self, subtitle):
+		if self.__selected_subtitle != subtitle and self.subtitles_enabled:
+			# kick
+			self.__selected_subtitle = subtitle
+			self.__serviceStarted()
+		else:
+			self.__selected_subtitle = subtitle
+
+	subtitles_enabled = property(lambda self: self.__subtitles_enabled, setSubtitlesEnable)
+	selected_subtitle = property(lambda self: self.__selected_subtitle, setSelectedSubtitle)