add runAsync support to wizzard

[enigma2.git] / lib / python / Screens / InfoBarGenerics.py

diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py
index 05a224d01125f3701f98f91f33d57b9ee9ea5978..99f0dc48399ee6238cd32854efa398a5e90f3936 100644 (file)
--- a/lib/python/Screens/InfoBarGenerics.py
+++ b/lib/python/Screens/InfoBarGenerics.py
@@ -568,9 +568,9 @@ class InfoBarRdsDecoder:
                                iPlayableService.evUpdatedRassSlidePic: self.RassSlidePicChanged
                        })
                
-               self["RdsActions"] = HelpableActionMap(self, "InfobarRdsActions",
+               self["RdsActions"] = ActionMap(["InfobarRdsActions"],
                {
-                       "startRassInteractive": (self.startRassInteractive, _("View Rass interactive..."))
+                       "startRassInteractive": self.startRassInteractive
                },-1)
 
                self["RdsActions"].setEnabled(False)
@@ -652,6 +652,7 @@ class InfoBarSeek:
                                if action[:5] == "seek:":
                                        time = int(action[5:])
                                        self.screen.seekRelative(time * 90000)
+                                       self.screen.doShow()
                                        return 1
                                else:
                                        return HelpableActionMap.action(self, contexts, action)
@@ -904,6 +905,10 @@ class InfoBarSeek:
        def __evEOF(self):
                if self.seekstate == self.SEEK_STATE_EOF:
                        return
+               if self.seekstate[1] < 0: # SEEK_STATE_BACK_*X
+                       print "end of stream while seeking back, ignoring."
+                       return
+
                # if we are seeking, we try to end up ~1s before the end, and pause there.
                if not self.seekstate in [self.SEEK_STATE_PLAY, self.SEEK_STATE_PAUSE]:
                        self.setSeekState(self.SEEK_STATE_EOF)
@@ -985,7 +990,7 @@ class InfoBarShowMovies:
 # Timeshift works the following way:
 #                                         demux0   demux1                    "TimeshiftActions" "TimeshiftActivateActions" "SeekActions"
 # - normal playback                       TUNER    unused      PLAY               enable                disable              disable
-# - user presses "yellow" button.         TUNER    record      PAUSE              enable                disable              enable
+# - user presses "yellow" button.         FILE     record      PAUSE              enable                disable              enable
 # - user presess pause again              FILE     record      PLAY               enable                disable              enable
 # - user fast forwards                    FILE     record      FF                 enable                disable              enable
 # - end of timeshift buffer reached       TUNER    record      PLAY               enable                enable               disable
@@ -1015,14 +1020,14 @@ class InfoBarTimeshift:
                        }, prio=1)
                self["TimeshiftActivateActions"] = ActionMap(["InfobarTimeshiftActivateActions"],
                        {
-                               "timeshiftActivateEnd": self.activateTimeshiftEnd, # something like "pause key"
-                               "timeshiftActivateEndAndPause": self.activateTimeshiftEndAndPause  # something like "backward key"
+                               "timeshiftActivateEnd": self.activateTimeshiftEnd, # something like "rewind key"
+                               "timeshiftActivateEndAndPause": self.activateTimeshiftEndAndPause  # something like "pause key"
                        }, prio=-1) # priority over record
 
                self.timeshift_enabled = 0
                self.timeshift_state = 0
-               self.ts_pause_timer = eTimer()
-               self.ts_pause_timer.timeout.get().append(self.pauseService)
+               self.ts_rewind_timer = eTimer()
+               self.ts_rewind_timer.timeout.get().append(self.rewindService)
 
                self.__event_tracker = ServiceEventTracker(screen=self, eventmap=
                        {
@@ -1040,7 +1045,7 @@ class InfoBarTimeshift:
                if ts is None:
                        self.session.open(MessageBox, _("Timeshift not possible!"), MessageBox.TYPE_ERROR)
                        print "no ts interface"
-                       return 0;
+                       return 0
 
                if self.timeshift_enabled:
                        print "hu, timeshift already enabled?"
@@ -1052,7 +1057,8 @@ class InfoBarTimeshift:
                                #self.pvrStateDialog["timeshift"].setRelative(time.time())
 
                                # PAUSE.
-                               self.setSeekState(self.SEEK_STATE_PAUSE)
+                               #self.setSeekState(self.SEEK_STATE_PAUSE)
+                               self.activateTimeshiftEnd(False)
 
                                # enable the "TimeshiftEnableActions", which will override
                                # the startTimeshift actions
@@ -1084,7 +1090,7 @@ class InfoBarTimeshift:
                self.__seekableStatusChanged()
 
        # activates timeshift, and seeks to (almost) the end
-       def activateTimeshiftEnd(self):
+       def activateTimeshiftEnd(self, back = True):
                ts = self.getTimeshift()
                print "activateTimeshiftEnd"
 
@@ -1100,23 +1106,17 @@ class InfoBarTimeshift:
                        self.setSeekState(self.SEEK_STATE_PAUSE)
                        self.seekRelativeToEnd(-90000) # seek approx. 1 sec before end
 
+               if back:
+                       self.ts_rewind_timer.start(200, 1)
+
+       def rewindService(self):
+               self.setSeekState(self.SEEK_STATE_BACK_16X)
+
        # same as activateTimeshiftEnd, but pauses afterwards.
        def activateTimeshiftEndAndPause(self):
                print "activateTimeshiftEndAndPause"
-               state = self.seekstate
-               self.activateTimeshiftEnd()
-
-               ## well, this is "andPause", but it could be pressed from pause,
-               ## when pausing on the (fake-)"live" picture, so an un-pause
-               ## is perfectly ok.
-
-               #print "now, pauseService"
-               #if state == self.SEEK_STATE_PLAY:
-               #       print "is PLAYING, start pause timer"
-               #       self.ts_pause_timer.start(200, 1)
-               #else:
-               #       print "unpause"
-               #       self.unPauseService()
+               #state = self.seekstate
+               self.activateTimeshiftEnd(False)
        
        def __seekableStatusChanged(self):
                enabled = False
@@ -1919,6 +1919,7 @@ class InfoBarSubtitleSupport(object):
                                iPlayableService.evUpdatedInfo: self.__updatedInfo
                        })
                self.cached_subtitle_checked = False
+               self.__selected_subtitle = None
 
        def __serviceStopped(self):
                self.subtitle_window.hide()
@@ -1929,8 +1930,7 @@ class InfoBarSubtitleSupport(object):
                if not self.cached_subtitle_checked:
                        subtitle = self.getCurrentServiceSubtitle()
                        self.cached_subtitle_checked = True
-                       if subtitle:
-                               self.__selected_subtitle = subtitle.getCachedSubtitle()
+                       self.__selected_subtitle = subtitle and subtitle.getCachedSubtitle()
                        if self.__selected_subtitle:
                                subtitle.enableSubtitles(self.subtitle_window.instance, self.selected_subtitle)
                                self.subtitle_window.show()