enable timeshifting in infobar

diff --git a/data/keymap.xml b/data/keymap.xml
index fea9cf76954d6dc06e634faf1c75fd7b9a55534d..7a26f85df94cb5ef02132d641074c3297e19a08e 100644 (file)
--- a/data/keymap.xml
+++ b/data/keymap.xml
@@ -190,6 +190,11 @@
                <key id="KEY_TV" mapto="timeshiftStop" flags="m" />
        </map>
 
+       <map context="InfobarTimeshiftActivateActions">
+               <key id="KEY_RED" mapto="timeshiftActivateEnd" flags="m" />
+               <key id="KEY_YELLOW" mapto="timeshiftActivateEndAndPause" flags="m" />
+       </map>
+
        <map context="InfobarMovieListActions">
                <key id="KEY_UP" mapto="up" flags="m" />
                <key id="KEY_DOWN" mapto="down" flags="m" />

diff --git a/data/skin.xml b/data/skin.xml
index 49f228932bbc1be322e44143acbe39383eb67340..d43613f2b35510a6494c38da0439a54058c950b7 100644 (file)
--- a/data/skin.xml
+++ b/data/skin.xml
@@ -1,5 +1,4 @@
 <skin>
-       
                <colors>
                        <color name="white"     value="#ffffff" />
                        <color name="black"     value="#000000" />
@@ -164,7 +163,6 @@
                        <widget name="ber_progress" position="447,15" size="88,6" />
 
                        <widget name="BlinkingPoint" pixmap="/usr/share/enigma2/record.png" position="430,31" zPosition="2" size="58,25" alphatest="on" />
-
                        <widget name="CryptActive" pixmap="/usr/share/enigma2/crypt.png" position="570,40" size="12,15" />
                        <widget name="DolbyActive" pixmap="/usr/share/enigma2/dolby.png" position="585,40" size="25,15" />
                        <widget name="FormatActive" pixmap="/usr/share/enigma2/format.png" position="613,40" size="28,15" />
@@ -204,7 +202,9 @@
                        <eLabel position="70,0" size="300,30" text=".oO Movie Player Oo." font="Regular;20" />
 -->
                        <widget name="ServiceName" position="69,25" size="427,26" valign="center" font="Regular;22" backgroundColor="#101258" />
-                       <widget name="CurrentTime" position="575,10" size="90,30" backgroundColor="dark" font="Regular;19" />
+                       <widget name="CurrentTime" position="575,10" size="90,25" backgroundColor="dark" font="Regular;19" />
+                          <!-- fixme -->
+                       <widget name="ElapsedTime" position="575,35" size="90,30" backgroundColor="dark" font="Regular;19" />
                </screen>
 
 

diff --git a/lib/python/Screens/InfoBar.py b/lib/python/Screens/InfoBar.py
index 2b96f1e54f1c4ee5148d23f400305d835394341d..147f891bcd5b3dec0133da8883fe6db6c7d8ebe1 100644 (file)
--- a/lib/python/Screens/InfoBar.py
+++ b/lib/python/Screens/InfoBar.py
@@ -15,7 +15,8 @@ from Screens.InfoBarGenerics import InfoBarShowHide, \
        InfoBarPowerKey, InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, \
        InfoBarEPG, InfoBarEvent, InfoBarServiceName, InfoBarSeek, InfoBarInstantRecord, \
        InfoBarAudioSelection, InfoBarAdditionalInfo, InfoBarNotifications, InfoBarDish, \
-       InfoBarSubserviceSelection, InfoBarTuner, InfoBarShowMovies, InfoBarTimeshift
+       InfoBarSubserviceSelection, InfoBarTuner, InfoBarShowMovies, InfoBarTimeshift,  \
+       InfoBarServiceNotifications
 
 from Screens.HelpMenu import HelpableScreen, HelpMenu
 
@@ -27,7 +28,7 @@ class InfoBar(Screen, InfoBarShowHide, InfoBarPowerKey,
        InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarEPG,
        InfoBarEvent, InfoBarServiceName, InfoBarInstantRecord, InfoBarAudioSelection, 
        HelpableScreen, InfoBarAdditionalInfo, InfoBarNotifications, InfoBarDish,
-       InfoBarSubserviceSelection, InfoBarTuner):
+       InfoBarSubserviceSelection, InfoBarTuner, InfoBarTimeshift, InfoBarSeek):
 
        def __init__(self, session):
                Screen.__init__(self, session)
@@ -43,7 +44,7 @@ class InfoBar(Screen, InfoBarShowHide, InfoBarPowerKey,
                                InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarEPG, \
                                InfoBarEvent, InfoBarServiceName, InfoBarInstantRecord, InfoBarAudioSelection, \
                                InfoBarAdditionalInfo, InfoBarNotifications, InfoBarDish, InfoBarSubserviceSelection, \
-                               InfoBarTuner:
+                               InfoBarTuner, InfoBarTimeshift, InfoBarSeek:
                        x.__init__(self)
 
                self.helpList.append((self["actions"], "InfobarActions", [("showMovies", "Watch a Movie...")]))
@@ -63,7 +64,8 @@ class InfoBar(Screen, InfoBarShowHide, InfoBarPowerKey,
 
 class MoviePlayer(Screen, InfoBarShowHide, InfoBarPowerKey, \
                InfoBarMenu, \
-               InfoBarServiceName, InfoBarSeek, InfoBarShowMovies, InfoBarAudioSelection, HelpableScreen, InfoBarNotifications):
+               InfoBarServiceName, InfoBarSeek, InfoBarShowMovies, InfoBarAudioSelection, HelpableScreen, InfoBarNotifications,
+               InfoBarServiceNotifications):
                
        def __init__(self, session, service):
                Screen.__init__(self, session)
@@ -73,10 +75,15 @@ class MoviePlayer(Screen, InfoBarShowHide, InfoBarPowerKey, \
                                "leavePlayer": (self.leavePlayer, _("leave movie player..."))
                        })
                
-               for x in HelpableScreen, InfoBarShowHide, InfoBarPowerKey, InfoBarMenu, InfoBarServiceName, InfoBarSeek, InfoBarShowMovies, InfoBarAudioSelection, InfoBarNotifications:
+               for x in HelpableScreen, InfoBarShowHide, InfoBarPowerKey, InfoBarMenu, \
+                               InfoBarServiceName, InfoBarSeek, InfoBarShowMovies, \
+                               InfoBarAudioSelection, InfoBarNotifications, \
+                               InfoBarServiceNotifications:
                        x.__init__(self)
 
                self["CurrentTime"] = ServicePosition(self.session.nav, ServicePosition.TYPE_REMAINING)
+               self["ElapsedTime"] = ServicePosition(self.session.nav, ServicePosition.TYPE_POSITION)
+               # TYPE_LENGTH?
                
                self.lastservice = self.session.nav.getCurrentlyPlayingServiceReference()
                self.session.nav.playService(service)