-from Screen import Screen
+from Tools.Profile import profile, profile_final
-from Screens.MovieSelection import MovieSelection
-from Screens.ChannelSelection import ChannelSelectionRadio
-from Screens.MessageBox import MessageBox
-from Screens.Ci import CiHandler
-from ServiceReference import ServiceReference
+from Screen import Screen
-from Components.Sources.Clock import Clock
-from Components.ActionMap import ActionMap, HelpableActionMap
-from Components.config import config
+profile("LOAD:enigma")
+from enigma import iPlayableService
-from Tools.Notifications import AddNotificationWithCallback
+profile("LOAD:ChannelSelectionRadio")
+from Screens.ChannelSelection import ChannelSelectionRadio
+profile("LOAD:MovieSelection")
+from Screens.MovieSelection import MovieSelection
+profile("LOAD:ChoiceBox")
+from Screens.ChoiceBox import ChoiceBox
+profile("LOAD:InfoBarGenerics")
from Screens.InfoBarGenerics import InfoBarShowHide, \
- InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarRadioText, \
- InfoBarEPG, InfoBarEvent, InfoBarServiceName, InfoBarSeek, InfoBarInstantRecord, \
+ InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarRdsDecoder, \
+ InfoBarEPG, InfoBarSeek, InfoBarInstantRecord, \
InfoBarAudioSelection, InfoBarAdditionalInfo, InfoBarNotifications, InfoBarDish, \
- InfoBarSubserviceSelection, InfoBarTuner, InfoBarShowMovies, InfoBarTimeshift, \
+ InfoBarSubserviceSelection, InfoBarShowMovies, InfoBarTimeshift, \
InfoBarServiceNotifications, InfoBarPVRState, InfoBarCueSheetSupport, InfoBarSimpleEventView, \
- InfoBarSummarySupport, InfoBarTimeshiftState, InfoBarTeletextPlugin, InfoBarExtensions, \
+ InfoBarSummarySupport, InfoBarMoviePlayerSummarySupport, InfoBarTimeshiftState, InfoBarTeletextPlugin, InfoBarExtensions, \
InfoBarSubtitleSupport, InfoBarPiP, InfoBarPlugins, InfoBarSleepTimer, InfoBarServiceErrorPopupSupport
-from Screens.HelpMenu import HelpableScreen, HelpMenu
-
-from enigma import *
+profile("LOAD:InitBar_Components")
+from Components.ActionMap import HelpableActionMap
+from Components.config import config
+from Components.ServiceEventTracker import ServiceEventTracker, InfoBarBase
-import time
+profile("LOAD:HelpableScreen")
+from Screens.HelpMenu import HelpableScreen
-class InfoBar(InfoBarShowHide,
- InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarEPG, InfoBarRadioText,
- InfoBarEvent, InfoBarServiceName, InfoBarInstantRecord, InfoBarAudioSelection,
+class InfoBar(InfoBarBase, InfoBarShowHide,
+ InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarEPG, InfoBarRdsDecoder,
+ InfoBarInstantRecord, InfoBarAudioSelection,
HelpableScreen, InfoBarAdditionalInfo, InfoBarNotifications, InfoBarDish,
- InfoBarSubserviceSelection, InfoBarTuner, InfoBarTimeshift, InfoBarSeek,
+ InfoBarSubserviceSelection, InfoBarTimeshift, InfoBarSeek,
InfoBarSummarySupport, InfoBarTimeshiftState, InfoBarTeletextPlugin, InfoBarExtensions,
InfoBarPiP, InfoBarPlugins, InfoBarSubtitleSupport, InfoBarSleepTimer, InfoBarServiceErrorPopupSupport,
Screen):
def __init__(self, session):
Screen.__init__(self, session)
-
- CiHandler.setSession(session)
-
self["actions"] = HelpableActionMap(self, "InfobarActions",
{
"showMovies": (self.showMovies, _("Play recorded movies...")),
}, prio=2)
for x in HelpableScreen, \
- InfoBarShowHide, \
- InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarEPG, InfoBarRadioText, \
- InfoBarEvent, InfoBarServiceName, InfoBarInstantRecord, InfoBarAudioSelection, \
+ InfoBarBase, InfoBarShowHide, \
+ InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarEPG, InfoBarRdsDecoder, \
+ InfoBarInstantRecord, InfoBarAudioSelection, \
InfoBarAdditionalInfo, InfoBarNotifications, InfoBarDish, InfoBarSubserviceSelection, \
- InfoBarTuner, InfoBarTimeshift, InfoBarSeek, InfoBarSummarySupport, InfoBarTimeshiftState, \
+ InfoBarTimeshift, InfoBarSeek, InfoBarSummarySupport, InfoBarTimeshiftState, \
InfoBarTeletextPlugin, InfoBarExtensions, InfoBarPiP, InfoBarSubtitleSupport, InfoBarSleepTimer, \
InfoBarPlugins, InfoBarServiceErrorPopupSupport:
x.__init__(self)
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=
+ {
+ iPlayableService.evUpdatedEventInfo: self.__eventInfoChanged
+ })
+
+ 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)
if config.usage.e1like_radio_mode.value:
self.showRadioChannelList(True)
else:
- self.session.open(ChannelSelectionRadio)
+ 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.openWithCallback(self.movieSelected, MovieSelection)
if service is not None:
self.session.open(MoviePlayer, service)
-class MoviePlayer(InfoBarShowHide, \
+class MoviePlayer(InfoBarBase, InfoBarShowHide, \
InfoBarMenu, \
- InfoBarServiceName, InfoBarSeek, InfoBarShowMovies, InfoBarAudioSelection, HelpableScreen, InfoBarNotifications,
+ InfoBarSeek, InfoBarShowMovies, InfoBarAudioSelection, HelpableScreen, InfoBarNotifications,
InfoBarServiceNotifications, InfoBarPVRState, InfoBarCueSheetSupport, InfoBarSimpleEventView,
- InfoBarSummarySupport, InfoBarSubtitleSupport, Screen, InfoBarExtensions, InfoBarTeletextPlugin,
+ InfoBarMoviePlayerSummarySupport, InfoBarSubtitleSupport, Screen, InfoBarTeletextPlugin,
InfoBarServiceErrorPopupSupport):
ENABLE_RESUME_SUPPORT = True
})
for x in HelpableScreen, InfoBarShowHide, InfoBarMenu, \
- InfoBarServiceName, InfoBarSeek, InfoBarShowMovies, \
+ InfoBarBase, InfoBarSeek, InfoBarShowMovies, \
InfoBarAudioSelection, InfoBarNotifications, InfoBarSimpleEventView, \
InfoBarServiceNotifications, InfoBarPVRState, InfoBarCueSheetSupport, \
- InfoBarSummarySupport, InfoBarSubtitleSupport, InfoBarExtensions, \
+ InfoBarMoviePlayerSummarySupport, InfoBarSubtitleSupport, \
InfoBarTeletextPlugin, InfoBarServiceErrorPopupSupport:
x.__init__(self)
self.lastservice = self.session.nav.getCurrentlyPlayingServiceReference()
self.session.nav.playService(service)
+ self.returning = False
def leavePlayer(self):
self.is_closing = True
- self.session.openWithCallback(self.leavePlayerConfirmed, MessageBox, _("Stop playing this movie?"))
-
+
+ if config.usage.on_movie_stop.value == "ask":
+ list = []
+ list.append((_("Yes"), "quit"))
+ if config.usage.setup_level.index >= 2: # expert+
+ list.append((_("Yes, returning to movie list"), "movielist"))
+ list.append((_("No"), "continue"))
+ if config.usage.setup_level.index >= 2: # expert+
+ list.append((_("No, but restart from begin"), "restart"))
+ self.session.openWithCallback(self.leavePlayerConfirmed, ChoiceBox, title=_("Stop playing this movie?"), list = list)
+ else:
+ self.leavePlayerConfirmed([True, config.usage.on_movie_stop.value])
+
def leavePlayerConfirmed(self, answer):
- if answer == True:
+ answer = answer and answer[1]
+ if answer == "quit":
self.session.nav.playService(self.lastservice)
+ config.movielist.last_videodir.cancel()
self.close()
-
+ elif answer == "movielist":
+ ref = self.session.nav.getCurrentlyPlayingServiceReference()
+ self.returning = True
+ self.session.openWithCallback(self.movieSelected, MovieSelection, ref)
+ self.session.nav.playService(self.lastservice)
+ elif answer == "restart":
+ self.doSeek(0)
+
+ def doEofInternal(self, playing):
+ if not self.execing:
+ return
+ if not playing :
+ return
+ self.is_closing = True
+ if config.usage.on_movie_eof.value == "ask":
+ list = []
+ list.append((_("Yes"), "quit"))
+ if config.usage.setup_level.index >= 2: # expert+
+ list.append((_("Yes, returning to movie list"), "movielist"))
+ list.append((_("No"), "continue"))
+ if config.usage.setup_level.index >= 2: # expert+
+ list.append((_("No, but restart from begin"), "restart"))
+ self.session.openWithCallback(self.leavePlayerConfirmed, ChoiceBox, title=_("Stop playing this movie?"), list = list)
+ else:
+ self.leavePlayerConfirmed([True, config.usage.on_movie_eof.value])
+
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.is_closing = False
self.session.nav.playService(service)
+ self.returning = False
+ elif self.returning:
+ self.close()
git.cweiske.de / enigma2.git / blobdiff