summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2015-02-02 09:51:32 +0100
committerKlaus Schmidinger <vdr@tvdr.de>2015-02-02 09:51:32 +0100
commited766859d7416fa6a23b98d3709632dbffb4553c (patch)
tree99b7c79fd0704320c854eeaa5b322b2ed333c820
parent5503161fdcd5fcb137ff79e00c028c477716d3fb (diff)
downloadvdr-ed766859d7416fa6a23b98d3709632dbffb4553c.tar.gz
vdr-ed766859d7416fa6a23b98d3709632dbffb4553c.tar.bz2
Added code from the "jumpplay" patch that makes the recording still be considered unviewed when stopping replay within RESUMEBACKUP seconds of the first mark
-rw-r--r--HISTORY3
-rw-r--r--dvbplayer.c4
2 files changed, 5 insertions, 2 deletions
diff --git a/HISTORY b/HISTORY
index 2537740a..db189e0f 100644
--- a/HISTORY
+++ b/HISTORY
@@ -8465,4 +8465,5 @@ Video Disk Recorder Revision History
- Updated the Lithuanian OSD texts (thanks to Valdemaras Pipiras).
- Added SDNOTIFY to Make.config.template (suggested by Christian Richter). Also
added NO_KBD and BIDI.
-
+- Added code from the "jumpplay" patch that makes the recording still be considered
+ unviewed when stopping replay within RESUMEBACKUP seconds of the first mark.
diff --git a/dvbplayer.c b/dvbplayer.c
index 0d7b3904..9e561ca1 100644
--- a/dvbplayer.c
+++ b/dvbplayer.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: dvbplayer.c 3.3 2015/02/01 10:45:41 kls Exp $
+ * $Id: dvbplayer.c 3.4 2015/02/02 09:51:32 kls Exp $
*/
#include "dvbplayer.h"
@@ -377,6 +377,8 @@ bool cDvbPlayer::Save(void)
if (index) {
int Index = ptsIndex.FindIndex(DeviceGetSTC());
if (Index >= 0) {
+ if (Setup.SkipEdited && marks.First() && abs(Index - marks.First()->Position()) <= int(round(RESUMEBACKUP * framesPerSecond)))
+ Index = 0; // when stopping within RESUMEBACKUP seconds of the first mark the recording shall still be considered unviewed
Index -= int(round(RESUMEBACKUP * framesPerSecond));
if (Index > 0)
Index = index->GetNextIFrame(Index, false);