diff options
| author | Felix Domke <tmbinc@elitedvb.net> | 2007-06-19 21:02:26 +0000 |
|---|---|---|
| committer | Felix Domke <tmbinc@elitedvb.net> | 2007-06-19 21:02:26 +0000 |
| commit | 0b3f18c91718d63aa418d95a81d8464914cd4031 (patch) | |
| tree | 7b4fbb3e18cadbaeadb0a3298624965f74ed1014 | |
| parent | fc0d94d9a917be5979e4c2fcd910bd441a35843e (diff) | |
| download | enigma2-0b3f18c91718d63aa418d95a81d8464914cd4031.tar.gz enigma2-0b3f18c91718d63aa418d95a81d8464914cd4031.zip | |
allow using other actionmap for InfobarSeekActions, only return MARKS in getNearestCutmark
| -rw-r--r-- | lib/python/Screens/InfoBarGenerics.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py index 29d36b0a..e12d2f18 100644 --- a/lib/python/Screens/InfoBarGenerics.py +++ b/lib/python/Screens/InfoBarGenerics.py @@ -618,7 +618,7 @@ class InfoBarSeek: 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, @@ -644,7 +644,7 @@ class InfoBarSeek: else: return HelpableActionMap.action(self, contexts, action) - self["SeekActions"] = InfoBarSeekActionMap(self, "InfobarSeekActions", + self["SeekActions"] = InfoBarSeekActionMap(self, actionmap, { "playpauseService": (self.playpauseService, _("pause")), "pauseService": (self.pauseService, _("pause")), @@ -1822,7 +1822,7 @@ class InfoBarCueSheetSupport: 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 |
