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, 4 insertions, 21 deletions

diff --git a/data/setup.xml b/data/setup.xml
index 9425afda..fa8ff3f9 100644
--- a/data/setup.xml
+++ b/data/setup.xml
@@ -45,27 +45,10 @@
 			<item level="2" text="Fast Forward speeds">config.seek.speeds_forward</item>
 			<item level="2" text="Rewind speeds">config.seek.speeds_backward</item>
 			<item level="2" text="Slow Motion speeds">config.seek.speeds_slowmotion</item>
-<!-- TRANSLATORS: Note that "Enter" in the two strings below should *not*
-     be interpreted as "Give speed as input". The intended meaning is
-     instead "Initial speed when starting winding", i.e. the speed at
-     which "winding mode" is entered when first pressing "rewind" or
-     "fast forward". -->  
-			<item level="2" text="Enter Fast Forward at speed">config.seek.enter_forward</item>
-			<item level="2" text="Enter Rewind at speed">config.seek.enter_backward</item>
-<!-- TRANSLATORS: The effect of "Non-smooth winding" is that rather
-     than using ordinary "continuous" or "smooth" winding, a fast
-     sequence of stills is shown when winding at high speeds. This
-     makes it much easier too follow when almost each frame comes from
-     a new scene. The effect is achieved by repeating each shown frame
-     a couple of times. The settings control both at which speed this
-     winding mode sets in, and how many times each frame should be
-     repeated. This was previously called "Discontinuous playback"
-     which was incomprehensible. "Non-smooth winding" may be a better
-     term, but note that there is nothing irregular about it. Synonyms
-     better suited for translation to other languages may be "stepwise
-     winding/playback", or "winding/playback using stills". -->
-			<item level="2" text="Use non-smooth winding at speeds above">config.seek.stepwise_minspeed</item>
-			<item level="2" text="Frame repeat count during non-smooth winding">config.seek.stepwise_repeat</item>
+<!-- TRANSLATORS: The following is the speed you get on the first press on fast-forward.
+     It was previously called "enter fast forward at speed" which was easily misunderstood. -->  
+			<item level="2" text="Initial Fast Forward speed">config.seek.enter_forward</item>
+			<item level="2" text="Initial Rewind speed">config.seek.enter_backward</item>
 			<item level="2" text="Behavior of 'pause' when paused">config.seek.on_pause</item>
 			<item level="2" text="Behavior of 0 key in PiP-mode">config.usage.pip_zero_button</item>
 			<item level="2" text="Alternative services tuner priority">config.usage.alternatives_priority</item>