3 files changed, 11 insertions, 7 deletions

diff --git a/MANUAL b/MANUAL
index 5b34ea16..c23aa708 100644
--- a/MANUAL
+++ b/MANUAL
@@ -985,10 +985,14 @@ Version 2.0
                          Defines the number of seconds to jump from the current replay
                          position in either direction, when pressing the '1' or '3'
                          key for the first time after the "Binary skip timeout".
+                         The valid range is 10...600.
 
-  Binary skip timeout (ms) = 3000
-                         Defines the number of milliseconds after which pressing the
+  Binary skip timeout (s) = 3
+                         Defines the number of seconds after which pressing the
                          '1' or '3' key falls back to the "Binary skip initial value".
+                         The valid range is 0...10. Setting the timeout to 0 disables
+                         the binary mode and makes '1' and '3' always skip the number
+                         of seconds configured as the initial value.
 
   Resume ID = 0          Defines an additional ID that can be used in a multi user
                          environment, so that every user has his/her own resume
diff --git a/config.c b/config.c
index e1928458..9e6f301b 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 3.5 2015/01/27 10:51:19 kls Exp $
+ * $Id: config.c 3.6 2015/01/29 09:01:30 kls Exp $
  */
 
 #include "config.h"
@@ -474,7 +474,7 @@ cSetup::cSetup(void)
   SkipEdited = 0;
   PauseAtLastMark = 0;
   BinarySkipInitial = 120;
-  BinarySkipTimeout = 3000;
+  BinarySkipTimeout = 3;
   ResumeID = 0;
   CurrentChannel = -1;
   CurrentVolume = MAXVOLUME;
diff --git a/menu.c b/menu.c
index b8d4a9c6..318f32c6 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 3.30 2015/01/27 14:09:49 kls Exp $
+ * $Id: menu.c 3.31 2015/01/29 09:00:37 kls Exp $
  */
 
 #include "menu.h"
@@ -3575,7 +3575,7 @@ cMenuSetupReplay::cMenuSetupReplay(void)
   Add(new cMenuEditBoolItem(tr("Setup.Replay$Skip edited parts"), &data.SkipEdited));
   Add(new cMenuEditBoolItem(tr("Setup.Replay$Pause replay at last mark"), &data.PauseAtLastMark));
   Add(new cMenuEditIntItem( tr("Setup.Replay$Binary skip initial value (s)"), &data.BinarySkipInitial, 10, 600));
-  Add(new cMenuEditIntItem( tr("Setup.Replay$Binary skip timeout (ms)"), &data.BinarySkipTimeout, 1000, 10000));
+  Add(new cMenuEditIntItem( tr("Setup.Replay$Binary skip timeout (s)"), &data.BinarySkipTimeout, 0, 10));
   Add(new cMenuEditIntItem(tr("Setup.Replay$Resume ID"), &data.ResumeID, 0, 99));
 }
 
@@ -4944,7 +4944,7 @@ int cBinarySkipper::GetValue(eKeys Key)
      currentValue /= 2;
      lastKey = kNone; // once the direction has changed, every further call halves the value
      }
-  timeout.Set(Setup.BinarySkipTimeout);
+  timeout.Set(Setup.BinarySkipTimeout * 1000);
   return max(currentValue, 1);
 }