from Components.BlinkingPixmap import BlinkingPixmapConditional
from Components.Harddisk import harddiskmanager
from Components.Input import Input
-from Components.Label import *
-from Components.Pixmap import Pixmap, PixmapConditional
+from Components.Label import Label
+from Components.Pixmap import Pixmap
from Components.PluginComponent import plugins
-from Components.ProgressBar import *
from Components.ServiceEventTracker import ServiceEventTracker
from Components.Sources.CurrentService import CurrentService
from Components.Sources.EventInfo import EventInfo
from Components.Sources.FrontendStatus import FrontendStatus
from Components.Sources.Boolean import Boolean
from Components.Sources.Clock import Clock
-from Components.TimerList import TimerEntryComponent
from Components.config import config, ConfigBoolean, ConfigClock
from EpgSelection import EPGSelection
from Plugins.Plugin import PluginDescriptor
def keyNumberGlobal(self, number):
# print "You pressed number " + str(number)
if number == 0:
- self.servicelist.recallPrevService()
+ if isinstance(self, InfoBarPiP) and self.pipHandles0Action():
+ self.pipDoHandle0Action()
+ else:
+ self.servicelist.recallPrevService()
else:
self.session.openWithCallback(self.numberEntered, NumberZap, number)
self["EPGActions"] = HelpableActionMap(self, "InfobarEPGActions",
{
"showEventInfo": (self.openEventView, _("show EPG...")),
+ "showSingleServiceEPG": (self.openSingleServiceEPG, _("show single service EPG...")),
+ "showInfobarOrEpgWhenInfobarAlreadyVisible": self.showEventInfoWhenNotVisible,
})
+ def showEventInfoWhenNotVisible(self):
+ if self.shown:
+ self.openEventView()
+ else:
+ self.toggleShow()
+ return 1
+
def zapToService(self, service):
if not service is None:
if self.servicelist.getRoot() != self.epg_bouquet: #already in correct bouquet?
SEEK_STATE_FF_2X = (0, 2, 0, ">> 2x")
SEEK_STATE_FF_4X = (0, 4, 0, ">> 4x")
SEEK_STATE_FF_8X = (0, 8, 0, ">> 8x")
+ SEEK_STATE_FF_16X = (0, 16, 0, ">> 16x")
SEEK_STATE_FF_32X = (0, 32, 0, ">> 32x")
+ SEEK_STATE_FF_48X = (0, 48, 0, ">> 48x")
SEEK_STATE_FF_64X = (0, 64, 0, ">> 64x")
SEEK_STATE_FF_128X = (0, 128, 0, ">> 128x")
+ SEEK_STATE_BACK_8X = (0, -8, 0, "<< 8x")
SEEK_STATE_BACK_16X = (0, -16, 0, "<< 16x")
SEEK_STATE_BACK_32X = (0, -32, 0, "<< 32x")
+ SEEK_STATE_BACK_48X = (0, -48, 0, "<< 48x")
SEEK_STATE_BACK_64X = (0, -64, 0, "<< 64x")
SEEK_STATE_BACK_128X = (0, -128, 0, "<< 128x")
SEEK_STATE_EOF = (1, 0, 0, "END")
- def __init__(self):
+ def __init__(self, actionmap = "InfobarSeekActions"):
self.__event_tracker = ServiceEventTracker(screen=self, eventmap=
{
iPlayableService.evSeekableStatusChanged: self.__seekableStatusChanged,
if action[:5] == "seek:":
time = int(action[5:])
self.screen.seekRelative(time * 90000)
- if isinstance(self.screen, InfoBarShowHide):
- self.screen.doShow()
+ if config.usage.show_infobar_on_skip.value:
+ self.screen.showAfterSeek()
return 1
else:
return HelpableActionMap.action(self, contexts, action)
- self["SeekActions"] = InfoBarSeekActionMap(self, "InfobarSeekActions",
+ self["SeekActions"] = InfoBarSeekActionMap(self, actionmap,
{
- "playpauseService": (self.playpauseService, _("pause")),
+ "playpauseService": self.playpauseService,
"pauseService": (self.pauseService, _("pause")),
"unPauseService": (self.unPauseService, _("continue")),
"seekFwd": (self.seekFwd, _("skip forward")),
- "seekFwdDown": self.seekFwdDown,
- "seekFwdUp": self.seekFwdUp,
+ "seekFwdManual": (self.seekFwdManual, _("skip forward (enter time)")),
"seekBack": (self.seekBack, _("skip backward")),
- "seekBackDown": self.seekBackDown,
- "seekBackUp": self.seekBackUp,
+ "seekBackManual": (self.seekBackManual, _("skip backward (enter time)")),
+
+ "seekFwdDef": (self.seekFwdDef, _("skip forward (self defined)")),
+ "seekBackDef": (self.seekBackDef, _("skip backward (self defined)"))
}, prio=-1)
# give them a little more priority to win over color buttons
self["SeekActions"].setEnabled(False)
self.seekstate = self.SEEK_STATE_PLAY
- self.onClose.append(self.delTimer)
-
- self.fwdtimer = False
- self.fwdKeyTimer = eTimer()
- self.fwdKeyTimer.timeout.get().append(self.fwdTimerFire)
-
- self.rwdtimer = False
- self.rwdKeyTimer = eTimer()
- self.rwdKeyTimer.timeout.get().append(self.rwdTimerFire)
+
+ self.seek_flag = True
self.onPlayStateChanged = [ ]
self.__seekableStatusChanged()
+ def showAfterSeek(self):
+ if isinstance(self, InfoBarShowHide):
+ self.doShow()
+
def up(self):
pass
def down(self):
pass
- def delTimer(self):
- del self.fwdKeyTimer
- del self.rwdKeyTimer
-
def getSeek(self):
service = self.session.nav.getCurrentService()
if service is None:
seekable.seekTo(90 * seektime)
- def seekFwdDown(self):
- print "start fwd timer"
- self.fwdtimer = True
- self.fwdKeyTimer.start(1000)
-
- def seekBackDown(self):
- print "start rewind timer"
- self.rwdtimer = True
- self.rwdKeyTimer.start(1000)
-
- def seekFwdUp(self):
- print "seekFwdUp"
- if self.fwdtimer:
- self.fwdKeyTimer.stop()
- self.fwdtimer = False
- self.seekFwd()
-
def seekFwd(self):
lookup = {
self.SEEK_STATE_PLAY: self.SEEK_STATE_FF_2X,
self.SEEK_STATE_PAUSE: self.SEEK_STATE_SM_EIGHTH,
self.SEEK_STATE_FF_2X: self.SEEK_STATE_FF_4X,
self.SEEK_STATE_FF_4X: self.SEEK_STATE_FF_8X,
- self.SEEK_STATE_FF_8X: self.SEEK_STATE_FF_32X,
- self.SEEK_STATE_FF_32X: self.SEEK_STATE_FF_64X,
+ self.SEEK_STATE_FF_8X: self.SEEK_STATE_FF_16X,
+ self.SEEK_STATE_FF_16X: self.SEEK_STATE_FF_32X,
+ self.SEEK_STATE_FF_32X: self.SEEK_STATE_FF_48X,
+ self.SEEK_STATE_FF_48X: self.SEEK_STATE_FF_64X,
self.SEEK_STATE_FF_64X: self.SEEK_STATE_FF_128X,
self.SEEK_STATE_FF_128X: self.SEEK_STATE_FF_128X,
- self.SEEK_STATE_BACK_16X: self.SEEK_STATE_PLAY,
+ self.SEEK_STATE_BACK_8X: self.SEEK_STATE_PLAY,
+ self.SEEK_STATE_BACK_16X: self.SEEK_STATE_BACK_8X,
self.SEEK_STATE_BACK_32X: self.SEEK_STATE_BACK_16X,
- self.SEEK_STATE_BACK_64X: self.SEEK_STATE_BACK_32X,
+ self.SEEK_STATE_BACK_48X: self.SEEK_STATE_BACK_32X,
+ self.SEEK_STATE_BACK_64X: self.SEEK_STATE_BACK_48X,
self.SEEK_STATE_BACK_128X: self.SEEK_STATE_BACK_64X,
self.SEEK_STATE_SM_HALF: self.SEEK_STATE_SM_HALF,
self.SEEK_STATE_SM_QUARTER: self.SEEK_STATE_SM_HALF,
}
self.setSeekState(lookup[self.seekstate])
- def seekBackUp(self):
- print "seekBackUp"
- if self.rwdtimer:
- self.rwdKeyTimer.stop()
- self.rwdtimer = False
- self.seekBack()
-
def seekBack(self):
lookup = {
- self.SEEK_STATE_PLAY: self.SEEK_STATE_BACK_16X,
+ self.SEEK_STATE_PLAY: self.SEEK_STATE_BACK_8X,
self.SEEK_STATE_PAUSE: self.SEEK_STATE_PAUSE,
self.SEEK_STATE_FF_2X: self.SEEK_STATE_PLAY,
self.SEEK_STATE_FF_4X: self.SEEK_STATE_FF_2X,
self.SEEK_STATE_FF_8X: self.SEEK_STATE_FF_4X,
- self.SEEK_STATE_FF_32X: self.SEEK_STATE_FF_8X,
- self.SEEK_STATE_FF_64X: self.SEEK_STATE_FF_32X,
+ self.SEEK_STATE_FF_16X: self.SEEK_STATE_FF_8X,
+ self.SEEK_STATE_FF_32X: self.SEEK_STATE_FF_16X,
+ self.SEEK_STATE_FF_48X: self.SEEK_STATE_FF_32X,
+ self.SEEK_STATE_FF_64X: self.SEEK_STATE_FF_48X,
self.SEEK_STATE_FF_128X: self.SEEK_STATE_FF_64X,
+ self.SEEK_STATE_BACK_8X: self.SEEK_STATE_BACK_16X,
self.SEEK_STATE_BACK_16X: self.SEEK_STATE_BACK_32X,
- self.SEEK_STATE_BACK_32X: self.SEEK_STATE_BACK_64X,
+ self.SEEK_STATE_BACK_32X: self.SEEK_STATE_BACK_48X,
+ self.SEEK_STATE_BACK_48X: self.SEEK_STATE_BACK_64X,
self.SEEK_STATE_BACK_64X: self.SEEK_STATE_BACK_128X,
self.SEEK_STATE_BACK_128X: self.SEEK_STATE_BACK_128X,
self.SEEK_STATE_SM_HALF: self.SEEK_STATE_SM_QUARTER,
self.SEEK_STATE_SM_QUARTER: self.SEEK_STATE_SM_EIGHTH,
self.SEEK_STATE_SM_EIGHTH: self.SEEK_STATE_PAUSE,
- self.SEEK_STATE_EOF: self.SEEK_STATE_BACK_16X,
+ self.SEEK_STATE_EOF: self.SEEK_STATE_BACK_8X,
}
self.setSeekState(lookup[self.seekstate])
if seekable is not None:
seekable.seekRelative(-1, 3)
- def fwdTimerFire(self):
- print "Display seek fwd"
- self.fwdKeyTimer.stop()
- self.fwdtimer = False
+ def seekFwdDef(self):
+ self.seek_flag = False
+ seconds = config.usage.self_defined_seek.value
+ print "Seek", seconds, "seconds self defined forward"
+ seekable = self.getSeek()
+ if seekable is not None:
+ seekable.seekRelative(1, seconds * 90000)
+
+ def seekBackDef(self):
+ self.seek_flag = False
+ seconds = config.usage.self_defined_seek.value
+ print "Seek", seconds, "seconds self defined backward"
+ seekable = self.getSeek()
+ if seekable is not None:
+ seekable.seekRelative(1, 0 - seconds * 90000)
+
+ def seekFwdManual(self):
self.session.openWithCallback(self.fwdSeekTo, MinuteInput)
def fwdSeekTo(self, minutes):
if seekable is not None:
seekable.seekRelative(1, minutes * 60 * 90000)
- def rwdTimerFire(self):
- print "rwdTimerFire"
- self.rwdKeyTimer.stop()
- self.rwdtimer = False
+ def seekBackManual(self):
self.session.openWithCallback(self.rwdSeekTo, MinuteInput)
def rwdSeekTo(self, minutes):
def checkSkipShowHideLock(self):
wantlock = self.seekstate != self.SEEK_STATE_PLAY
- if config.usage.show_infobar_on_zap.value:
+ if config.usage.show_infobar_on_skip.value:
if self.lockedBecauseOfSkipping and not wantlock:
self.unlockShow()
self.lockedBecauseOfSkipping = False
self.doSeek(0)
def seekRelative(self, diff):
- seekable = self.getSeek()
- if seekable is not None:
- print "seekRelative: res:", seekable.seekRelative(1, diff)
+ if self.seek_flag == True:
+ seekable = self.getSeek()
+ if seekable is not None:
+ print "seekRelative: res:", seekable.seekRelative(1, diff)
+ else:
+ print "seek failed!"
else:
- print "seek failed!"
+ self.seek_flag = True
def seekRelativeToEnd(self, diff):
assert diff <= 0, "diff is expected to be negative!"
def __init__(self):
self["MovieListActions"] = HelpableActionMap(self, "InfobarMovieListActions",
{
- "movieList": (self.showMovies, "movie list"),
- "up": (self.showMovies, "movie list"),
- "down": (self.showMovies, "movie list")
+ "movieList": (self.showMovies, _("movie list")),
+ "up": (self.showMovies, _("movie list")),
+ "down": (self.showMovies, _("movie list"))
})
# InfoBarTimeshift requires InfoBarSeek, instantiated BEFORE!
return list
def runPlugin(self, plugin):
- plugin(session = self.session)
+ plugin(session = self.session, servicelist = self.servicelist)
# depends on InfoBarExtensions
class InfoBarSleepTimer:
def pipShown(self):
return self.session.pipshown
+ def pipHandles0Action(self):
+ return self.pipShown() and config.usage.pip_zero_button.value != "standard"
+
def getShowHideName(self):
if self.session.pipshown:
return _("Disable Picture in Picture")
self.session.pipshown = False
else:
self.session.pip = self.session.instantiateDialog(PictureInPicture)
+ self.session.pip.show()
newservice = self.session.nav.getCurrentlyPlayingServiceReference()
if self.session.pip.playService(newservice):
self.session.pipshown = True
def movePiP(self):
self.session.open(PiPSetup, pip = self.session.pip)
+ def pipDoHandle0Action(self):
+ use = config.usage.pip_zero_button.value
+ if "swap" == use:
+ self.swapPiP()
+ elif "swapstop" == use:
+ self.swapPiP()
+ self.showPiP()
+ elif "stop" == use:
+ self.showPiP()
+
from RecordTimer import parseEvent
class InfoBarInstantRecord:
if not x in self.session.nav.RecordTimer.timer_list:
self.recording.remove(x)
elif x.dontSave and x.isRunning():
- list.append(TimerEntryComponent(x, False))
+ list.append((x, False))
if answer[1] == "changeduration":
if len(self.recording) == 1:
n = audio and audio.getNumberOfTracks() or 0
keys = [ "red", "", "1", "2", "3", "4", "5", "6", "7", "8", "9", "0"] + [""]*n
tlist = []
- print "tlist:", tlist
if n > 0:
self.audioChannel = service.audioChannel()
tlist.append((description, x))
- selectedAudio = tlist[0][1]
- tlist.sort(lambda x,y : cmp(x[0], y[0]))
+ selectedAudio = audio.getCurrentTrack()
+ tlist.sort(key=lambda x: x[0])
selection = 2
for x in tlist:
ENABLE_RESUME_SUPPORT = False
- def __init__(self):
- self["CueSheetActions"] = HelpableActionMap(self, "InfobarCueSheetActions",
+ def __init__(self, actionmap = "InfobarCueSheetActions"):
+ self["CueSheetActions"] = HelpableActionMap(self, actionmap,
{
- "jumpPreviousMark": (self.jumpPreviousMark, "jump to next marked position"),
- "jumpNextMark": (self.jumpNextMark, "jump to previous marked position"),
- "toggleMark": (self.toggleMark, "toggle a cut mark at the current position")
+ "jumpPreviousMark": (self.jumpPreviousMark, _("jump to previous marked position")),
+ "jumpNextMark": (self.jumpNextMark, _("jump to next marked position")),
+ "toggleMark": (self.toggleMark, _("toggle a cut mark at the current position"))
}, prio=1)
self.cut_list = [ ]
seekable = self.__getSeekable()
if seekable is not None:
seekable.seekTo(self.resume_point)
+ self.hideAfterResume()
+
+ def hideAfterResume(self):
+ if isinstance(self, InfoBarShowHide):
+ self.hide()
def __getSeekable(self):
service = self.session.nav.getCurrentService()
nearest = None
for cp in self.cut_list:
diff = cmp(cp[0] - pts)
- if diff >= 0 and (nearest is None or cmp(nearest[0] - pts) > diff):
+ if cp[1] == self.CUT_TYPE_MARK and diff >= 0 and (nearest is None or cmp(nearest[0] - pts) > diff):
nearest = cp
return nearest
def addMark(self, point):
insort(self.cut_list, point)
self.uploadCuesheet()
+ self.showAfterCuesheetOperation()
def removeMark(self, point):
self.cut_list.remove(point)
self.uploadCuesheet()
+ self.showAfterCuesheetOperation()
+
+ def showAfterCuesheetOperation(self):
+ if isinstance(self, InfoBarShowHide):
+ self.doShow()
def __getCuesheet(self):
service = self.session.nav.getCurrentService()
cue = self.__getCuesheet()
if cue is None:
- print "upload failed, no cuesheet interface"
- return
- self.cut_list = cue.getCutList()
+ print "download failed, no cuesheet interface"
+ self.cut_list = [ ]
+ else:
+ self.cut_list = cue.getCutList()
class InfoBarSummary(Screen):
skin = """