X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/4de3bf1f4ed536706798a2e39b051a2357ff80d9..05aa25aa522a21bd5594fd774b8685afd33fb69b:/lib/python/Screens/InfoBar.py

diff --git a/lib/python/Screens/InfoBar.py b/lib/python/Screens/InfoBar.py
index 38bb0329..92be7719 100644
--- a/lib/python/Screens/InfoBar.py
+++ b/lib/python/Screens/InfoBar.py
@@ -1,45 +1,162 @@
 from Screen import Screen
 
-from Components.Clock import Clock
-from Components.ActionMap import ActionMap
-from Screens.AudioSelection import AudioSelection
+from Screens.MovieSelection import MovieSelection
+from Screens.ChannelSelection import ChannelSelectionRadio
+from Screens.MessageBox import MessageBox
+from Screens.Ci import CiHandler
 
-from Screens.InfoBarGenerics import InfoBarVolumeControl, InfoBarShowHide, \
-	InfoBarPowerKey, InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, \
-	InfoBarEPG, InfoBarEvent, InfoBarServiceName, InfoBarPVR, InfoBarInstantRecord
+from Components.Sources.Clock import Clock
+from Components.ActionMap import HelpableActionMap
+from Components.config import config
+from Components.ServiceEventTracker import ServiceEventTracker
 
-from enigma import *
+from Screens.InfoBarGenerics import InfoBarShowHide, \
+	InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarRdsDecoder, \
+	InfoBarEPG, InfoBarEvent, InfoBarServiceName, InfoBarSeek, InfoBarInstantRecord, \
+	InfoBarAudioSelection, InfoBarAdditionalInfo, InfoBarNotifications, InfoBarDish, \
+	InfoBarSubserviceSelection, InfoBarTuner, InfoBarShowMovies, InfoBarTimeshift,  \
+	InfoBarServiceNotifications, InfoBarPVRState, InfoBarCueSheetSupport, InfoBarSimpleEventView, \
+	InfoBarSummarySupport, InfoBarTimeshiftState, InfoBarTeletextPlugin, InfoBarExtensions, \
+	InfoBarSubtitleSupport, InfoBarPiP, InfoBarPlugins, InfoBarSleepTimer, InfoBarServiceErrorPopupSupport
 
-import time
+from Screens.HelpMenu import HelpableScreen
+
+from enigma import iPlayableService
+
+class InfoBar(InfoBarShowHide,
+	InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarEPG, InfoBarRdsDecoder,
+	InfoBarEvent, InfoBarServiceName, InfoBarInstantRecord, InfoBarAudioSelection, 
+	HelpableScreen, InfoBarAdditionalInfo, InfoBarNotifications, InfoBarDish,
+	InfoBarSubserviceSelection, InfoBarTuner, InfoBarTimeshift, InfoBarSeek,
+	InfoBarSummarySupport, InfoBarTimeshiftState, InfoBarTeletextPlugin, InfoBarExtensions,
+	InfoBarPiP, InfoBarPlugins, InfoBarSubtitleSupport, InfoBarSleepTimer, InfoBarServiceErrorPopupSupport,
+	Screen):
+	
+	ALLOW_SUSPEND = True
 
-class InfoBar(Screen, InfoBarVolumeControl, InfoBarShowHide, InfoBarPowerKey, \
-	InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarEPG, \
-	InfoBarEvent, InfoBarServiceName, InfoBarPVR, InfoBarInstantRecord):
 	def __init__(self, session):
 		Screen.__init__(self, session)
+
+		CiHandler.setSession(session)
+
+		self["actions"] = HelpableActionMap(self, "InfobarActions",
+			{
+				"showMovies": (self.showMovies, _("Play recorded movies...")),
+				"showRadio": (self.showRadio, _("Show the radio player...")),
+				"showTv": (self.showTv, _("Show the tv player...")),
+			}, prio=2)
 		
-		for x in InfoBarVolumeControl, InfoBarShowHide, InfoBarPowerKey, \
-			InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarEPG, \
-			InfoBarEvent, InfoBarServiceName, InfoBarPVR, InfoBarInstantRecord:
+		for x in HelpableScreen, \
+				InfoBarShowHide, \
+				InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarEPG, InfoBarRdsDecoder, \
+				InfoBarEvent, InfoBarServiceName, InfoBarInstantRecord, InfoBarAudioSelection, \
+				InfoBarAdditionalInfo, InfoBarNotifications, InfoBarDish, InfoBarSubserviceSelection, \
+				InfoBarTuner, InfoBarTimeshift, InfoBarSeek, InfoBarSummarySupport, InfoBarTimeshiftState, \
+				InfoBarTeletextPlugin, InfoBarExtensions, InfoBarPiP, InfoBarSubtitleSupport, InfoBarSleepTimer, \
+				InfoBarPlugins, InfoBarServiceErrorPopupSupport:
 			x.__init__(self)
 
-		self["actions"] = ActionMap( [ "InfobarActions" ], 
+		self.helpList.append((self["actions"], "InfobarActions", [("showMovies", _("view recordings..."))]))
+		self.helpList.append((self["actions"], "InfobarActions", [("showRadio", _("hear radio..."))]))
+
+		self["CurrentTime"] = Clock()
+
+		self.__event_tracker = ServiceEventTracker(screen=self, eventmap=
 			{
-				"showMovies": self.showMovies,
-				#"quit": self.quit,
-				"audioSelection": self.audioSelection,
+				iPlayableService.evUpdatedEventInfo: self.__eventInfoChanged
 			})
 
-		self["CurrentTime"] = Clock()
-		# ServicePosition(self.session.nav, ServicePosition.TYPE_REMAINING)
-		# Clock()
+		self.current_begin_time=0
+
+	def __eventInfoChanged(self):
+		if self.execing:
+			service = self.session.nav.getCurrentService()
+			old_begin_time = self.current_begin_time
+			info = service and service.info()
+			ptr = info and info.getEvent(0)
+			self.current_begin_time = ptr and ptr.getBeginTime() or 0
+			if config.usage.show_infobar_on_event_change.value:
+				if old_begin_time and old_begin_time != self.current_begin_time:
+					self.doShow()
+
+	def __checkServiceStarted(self):
+		self.__serviceStarted(True)
+		self.onExecBegin.remove(self.__checkServiceStarted)
+
+	def serviceStarted(self):  #override from InfoBarShowHide
+		new = self.servicelist.newServicePlayed()
+		if self.execing:
+			InfoBarShowHide.serviceStarted(self)
+			self.current_begin_time=0
+		elif not self.__checkServiceStarted in self.onShown and new:
+			self.onShown.append(self.__checkServiceStarted)
+
+	def __checkServiceStarted(self):
+		self.serviceStarted()
+		self.onShown.remove(self.__checkServiceStarted)
+
+	def showTv(self):
+		self.showTvChannelList(True)
+
+	def showRadio(self):
+		if config.usage.e1like_radio_mode.value:
+			self.showRadioChannelList(True)
+		else:
+			self.rds_display.hide() # in InfoBarRdsDecoder
+			self.session.openWithCallback(self.ChannelSelectionRadioClosed, ChannelSelectionRadio, self)
+
+	def ChannelSelectionRadioClosed(self, *arg):
+		self.rds_display.show()  # in InfoBarRdsDecoder
 
 	def showMovies(self):
-		self.session.open(MovieSelection)
-
-	def audioSelection(self):
-		service = self.session.nav.getCurrentService()
-		audio = service.audioTracks()
-		n = audio.getNumberOfTracks()
-		if n > 0:
-			self.session.open(AudioSelection, audio)
+		self.session.openWithCallback(self.movieSelected, MovieSelection)
+
+	def movieSelected(self, service):
+		if service is not None:
+			self.session.open(MoviePlayer, service)
+
+class MoviePlayer(InfoBarShowHide, \
+		InfoBarMenu, \
+		InfoBarServiceName, InfoBarSeek, InfoBarShowMovies, InfoBarAudioSelection, HelpableScreen, InfoBarNotifications,
+		InfoBarServiceNotifications, InfoBarPVRState, InfoBarCueSheetSupport, InfoBarSimpleEventView,
+		InfoBarSummarySupport, InfoBarSubtitleSupport, Screen, InfoBarTeletextPlugin,
+		InfoBarServiceErrorPopupSupport):
+
+	ENABLE_RESUME_SUPPORT = True
+	ALLOW_SUSPEND = True
+		
+	def __init__(self, session, service):
+		Screen.__init__(self, session)
+		
+		self["actions"] = HelpableActionMap(self, "MoviePlayerActions",
+			{
+				"leavePlayer": (self.leavePlayer, _("leave movie player..."))
+			})
+		
+		for x in HelpableScreen, InfoBarShowHide, InfoBarMenu, \
+				InfoBarServiceName, InfoBarSeek, InfoBarShowMovies, \
+				InfoBarAudioSelection, InfoBarNotifications, InfoBarSimpleEventView, \
+				InfoBarServiceNotifications, InfoBarPVRState, InfoBarCueSheetSupport, \
+				InfoBarSummarySupport, InfoBarSubtitleSupport, \
+				InfoBarTeletextPlugin, InfoBarServiceErrorPopupSupport:
+			x.__init__(self)
+
+		self.lastservice = self.session.nav.getCurrentlyPlayingServiceReference()
+		self.session.nav.playService(service)
+
+	def leavePlayer(self):
+		self.is_closing = True
+		self.session.openWithCallback(self.leavePlayerConfirmed, MessageBox, _("Stop playing this movie?"))
+	
+	def leavePlayerConfirmed(self, answer):
+		if answer == True:
+			self.session.nav.playService(self.lastservice)
+			self.close()
+			
+	def showMovies(self):
+		ref = self.session.nav.getCurrentlyPlayingServiceReference()
+		self.session.openWithCallback(self.movieSelected, MovieSelection, ref)
+
+	def movieSelected(self, service):
+		if service is not None:
+			self.session.nav.playService(service)