Playback/Skipping fixes / cleanup by A. Holst

* Jumping between marks in the movie, with "<" and ">", doesn't work
  well when there are cut marks in the movie. Especially jumping
  backwards will fail if there is a mark in a cut out region that is
  to be jumped over. (InfoBarGenerics.py, chunks 3 and 4)

* Now when rewind works at all platforms also at low speeds, the
  rewind speeds x2 and x4 should be added again to the
  default. (UsageConfig.py, chunk 1)

* Cleanup some obsolete code: SeekBackHack and non-smooth
  winding. None of these can be used anymore, but remnants were left
  in the code and in the configuration alternatives. It is high time
  to clean these out. (setup.xml, UsageConfig.py chunk 2,
  InfoBarGenerics.py chunks 1 and 2, DVDPlayer)

* In the position gauge of the movie player, marks in the movie are
  shown as red dots. Long time ago the last position was also shown as
  a red dot, which was bad because it was confused with the marks, so
  it was removed. However, jumping between marks in the movie with "<"
  and ">" also stops at the last position, which is useful e.g. if you
  don't automatically start playing from the last position. The code
  below adds the last position back to the position gauge as a green dot,
  to distinguish it from the red ones. (epositiongauge.cpp)

refs bug #570

1 files changed, 1 insertions, 7 deletions

diff --git a/lib/python/Plugins/Extensions/DVDPlayer/plugin.py b/lib/python/Plugins/Extensions/DVDPlayer/plugin.py
index e092e82f..3d262c92 100755
--- a/lib/python/Plugins/Extensions/DVDPlayer/plugin.py
+++ b/lib/python/Plugins/Extensions/DVDPlayer/plugin.py
@@ -222,8 +222,6 @@ class DVDPlayer(Screen, InfoBarBase, InfoBarNotifications, InfoBarSeek, InfoBarP
 		self.saved_config_speeds_backward = config.seek.speeds_backward.value
 		self.saved_config_enter_forward = config.seek.enter_forward.value
 		self.saved_config_enter_backward = config.seek.enter_backward.value
-		self.saved_config_seek_stepwise_minspeed = config.seek.stepwise_minspeed.value
-		self.saved_config_seek_stepwise_repeat = config.seek.stepwise_repeat.value
 		self.saved_config_seek_on_pause = config.seek.on_pause.value
 		self.saved_config_seek_speeds_slowmotion = config.seek.speeds_slowmotion.value
 
@@ -233,8 +231,6 @@ class DVDPlayer(Screen, InfoBarBase, InfoBarNotifications, InfoBarSeek, InfoBarP
 		config.seek.speeds_slowmotion.value = [ ]
 		config.seek.enter_forward.value = "2"
 		config.seek.enter_backward.value = "2"
-		config.seek.stepwise_minspeed.value = "Never"
-		config.seek.stepwise_repeat.value = "3"
 		config.seek.on_pause.value = "play"
 
 	def restore_infobar_seek_config(self):
@@ -243,8 +239,6 @@ class DVDPlayer(Screen, InfoBarBase, InfoBarNotifications, InfoBarSeek, InfoBarP
 		config.seek.speeds_slowmotion.value = self.saved_config_seek_speeds_slowmotion
 		config.seek.enter_forward.value = self.saved_config_enter_forward
 		config.seek.enter_backward.value = self.saved_config_enter_backward
-		config.seek.stepwise_minspeed.value = self.saved_config_seek_stepwise_minspeed
-		config.seek.stepwise_repeat.value = self.saved_config_seek_stepwise_repeat
 		config.seek.on_pause.value = self.saved_config_seek_on_pause
 
 	def __init__(self, session, dvd_device = None, dvd_filelist = [ ], args = None):
@@ -256,7 +250,7 @@ class DVDPlayer(Screen, InfoBarBase, InfoBarNotifications, InfoBarSeek, InfoBarP
 		HelpableScreen.__init__(self)
 		self.save_infobar_seek_config()
 		self.change_infobar_seek_config()
-		InfoBarSeek.__init__(self, useSeekBackHack=False)
+		InfoBarSeek.__init__(self)
 		InfoBarPVRState.__init__(self)
 		self.dvdScreen = self.session.instantiateDialog(DVDOverlay)