Merge branch 'master' into bug_245_record_playback_fixes

diff --combined lib/python/Screens/InfoBarGenerics.py
index 5336f9a,2cbfeb7..39a8b59
--- 1/lib/python/Screens/InfoBarGenerics.py
--- 2/lib/python/Screens/InfoBarGenerics.py
+++ b/lib/python/Screens/InfoBarGenerics.py
@@@ -24,7 -24,6 +24,6 @@@ from Screens.TimerSelection import Time
  from Screens.PictureInPicture import PictureInPicture
  from Screens.SubtitleDisplay import SubtitleDisplay
  from Screens.RdsDisplay import RdsInfoDisplay, RassInteractive
- from Screens.SleepTimerEdit import SleepTimerEdit
  from Screens.TimeDateInput import TimeDateInput
  from ServiceReference import ServiceReference
  
@@@ -692,6 -691,8 +691,6 @@@ class InfoBarSeek
                                iPlayableService.evSOF: self.__evSOF,
                        })
  
 -              self.minSpeedBackward = useSeekBackHack and 16 or 0
 -
                class InfoBarSeekActionMap(HelpableActionMap):
                        def __init__(self, screen, *args, **kwargs):
                                HelpableActionMap.__init__(self, screen, *args, **kwargs)
@@@ -738,19 -739,24 +737,19 @@@
                self.__seekableStatusChanged()
  
        def makeStateForward(self, n):
 -              minspeed = config.seek.stepwise_minspeed.value
 -              repeat = int(config.seek.stepwise_repeat.value)
 -              if minspeed != "Never" and n >= int(minspeed) and repeat > 1:
 -                      return (0, n * repeat, repeat, ">> %dx" % n)
 -              else:
 +#             minspeed = config.seek.stepwise_minspeed.value
 +#             repeat = int(config.seek.stepwise_repeat.value)
 +#             if minspeed != "Never" and n >= int(minspeed) and repeat > 1:
 +#                     return (0, n * repeat, repeat, ">> %dx" % n)
 +#             else:
                        return (0, n, 0, ">> %dx" % n)
  
        def makeStateBackward(self, n):
 -              minspeed = config.seek.stepwise_minspeed.value
 -              repeat = int(config.seek.stepwise_repeat.value)
 -              if self.minSpeedBackward and n < self.minSpeedBackward:
 -                      r = (self.minSpeedBackward - 1)/ n + 1
 -                      if minspeed != "Never" and n >= int(minspeed) and repeat > 1:
 -                              r = max(r, repeat)
 -                      return (0, -n * r, r, "<< %dx" % n)
 -              elif minspeed != "Never" and n >= int(minspeed) and repeat > 1:
 -                      return (0, -n * repeat, repeat, "<< %dx" % n)
 -              else:
 +#             minspeed = config.seek.stepwise_minspeed.value
 +#             repeat = int(config.seek.stepwise_repeat.value)
 +#             if minspeed != "Never" and n >= int(minspeed) and repeat > 1:
 +#                     return (0, -n * repeat, repeat, "<< %dx" % n)
 +#             else:
                        return (0, -n, 0, "<< %dx" % n)
  
        def makeStateSlowMotion(self, n):
@@@ -870,7 -876,7 +869,7 @@@
                        if config.seek.on_pause.value == "play":
                                self.unPauseService()
                        elif config.seek.on_pause.value == "step":
 -                              self.doSeekRelative(0)
 +                              self.doSeekRelative(1)
                        elif config.seek.on_pause.value == "last":
                                self.setSeekState(self.lastseekstate)
                                self.lastseekstate = self.SEEK_STATE_PLAY
@@@ -943,7 -949,7 +942,7 @@@
                        self.setSeekState(self.makeStateBackward(int(config.seek.enter_backward.value)))
                        self.doSeekRelative(-6)
                elif seekstate == self.SEEK_STATE_PAUSE:
 -                      self.doSeekRelative(-3)
 +                      self.doSeekRelative(-1)
                elif self.isStateForward(seekstate):
                        speed = seekstate[1]
                        if seekstate[2]:
@@@ -1350,17 -1356,6 +1349,6 @@@ class InfoBarJobman
                job_manager.in_background = in_background
  
  # depends on InfoBarExtensions
- class InfoBarSleepTimer:
-       def __init__(self):
-               self.addExtension((self.getSleepTimerName, self.showSleepTimerSetup, lambda: True), "1")
- 
-       def getSleepTimerName(self):
-               return _("Sleep Timer")
- 
-       def showSleepTimerSetup(self):
-               self.session.open(SleepTimerEdit)
- 
- # depends on InfoBarExtensions
  class InfoBarPiP:
        def __init__(self):
                try: