frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00
Code Issues Releases Wiki Activity

Changed unit and range for binary skip timeout

Browse Source
This commit is contained in:
Klaus Schmidinger 2015-01-29 09:05:50 +01:00
parent 91e0151674
commit 7f195606ee
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
MANUAL
View File

@ -985,10 +985,14 @@ Version 2.0
Defines the number of seconds to jump from the current replay Defines the number of seconds to jump from the current replay
position in either direction, when pressing the '1' or '3' position in either direction, when pressing the '1' or '3'
key for the first time after the "Binary skip timeout". key for the first time after the "Binary skip timeout".
The valid range is 10...600.
Binary skip timeout (ms) = 3000 Binary skip timeout (s) = 3
Defines the number of milliseconds after which pressing the Defines the number of seconds after which pressing the
'1' or '3' key falls back to the "Binary skip initial value". '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 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 environment, so that every user has his/her own resume

4
config.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * 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" #include "config.h"
@ -474,7 +474,7 @@ cSetup::cSetup(void)
SkipEdited = 0; SkipEdited = 0;
PauseAtLastMark = 0; PauseAtLastMark = 0;
BinarySkipInitial = 120; BinarySkipInitial = 120;
BinarySkipTimeout = 3000; BinarySkipTimeout = 3;
ResumeID = 0; ResumeID = 0;
CurrentChannel = -1; CurrentChannel = -1;
CurrentVolume = MAXVOLUME; CurrentVolume = MAXVOLUME;

6
menu.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * 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" #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$Skip edited parts"), &data.SkipEdited));
Add(new cMenuEditBoolItem(tr("Setup.Replay$Pause replay at last mark"), &data.PauseAtLastMark)); 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 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)); Add(new cMenuEditIntItem(tr("Setup.Replay$Resume ID"), &data.ResumeID, 0, 99));
} }
@ -4944,7 +4944,7 @@ int cBinarySkipper::GetValue(eKeys Key)
currentValue /= 2; currentValue /= 2;
lastKey = kNone; // once the direction has changed, every further call halves the value 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); return max(currentValue, 1);
} }