diff options
| -rw-r--r-- | CONTRIBUTORS | 1 | ||||
| -rw-r--r-- | HISTORY | 5 | ||||
| -rw-r--r-- | recording.c | 6 |
3 files changed, 8 insertions, 4 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS index a9a9358f..a906532d 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -2629,6 +2629,7 @@ Jörg Wendel <vdr-ml@jwendel.de> for adding the 'aux' member to cEvent for reporting a possible deadlock when quickly zapping through encrypted channels for a patch that was used to implement cStatus::MarksModified() + for suggesting to no longer log unaligned marks in cMarks::Align() Peter Pinnau <vdr@unterbrecher.de> for reporting that 'uint32_t' requires including stdint.h in font.h on some systems @@ -9162,7 +9162,7 @@ Video Disk Recorder Revision History a subdirectory. - SVDRP peering can now be limited to the default SVDRP host (see MANUAL for details). -2018-03-11: Version 2.3.9 +2018-03-17: Version 2.3.9 - Updated the Italian OSD texts (thanks to Diego Pierotto). - Updated the Finnish OSD texts (thanks to Rolf Ahrenberg). @@ -9307,3 +9307,6 @@ Video Disk Recorder Revision History recordings in the video directory (which was introduced in version 2.3.8), because it triggered re-reading the video directory too fast. - Improved handling VPS timers to better react to EPG changes during an ongoing recording. +- Commented out the logging in cMarks::Align(), to avoid log entries in case of editing + marks that are not generated by VDR itself, and thus may be a little off (suggested by + Jörg Wendel). You can activate this line again for debugging if necessary. diff --git a/recording.c b/recording.c index 3cff2bb7..0cf265cb 100644 --- a/recording.c +++ b/recording.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: recording.c 4.21 2018/03/09 15:30:52 kls Exp $ + * $Id: recording.c 4.22 2018/03/17 10:56:13 kls Exp $ */ #include "recording.h" @@ -2190,8 +2190,8 @@ void cMarks::Align(void) cIndexFile IndexFile(recordingFileName, false, isPesRecording); for (cMark *m = First(); m; m = Next(m)) { int p = IndexFile.GetClosestIFrame(m->Position()); - if (int d = m->Position() - p) { - isyslog("aligned editing mark %s to %s (off by %d frame%s)", *IndexToHMSF(m->Position(), true, framesPerSecond), *IndexToHMSF(p, true, framesPerSecond), d, abs(d) > 1 ? "s" : ""); + if (m->Position() - p) { + //isyslog("aligned editing mark %s to %s (off by %d frame%s)", *IndexToHMSF(m->Position(), true, framesPerSecond), *IndexToHMSF(p, true, framesPerSecond), m->Position() - p, abs(m->Position() - p) > 1 ? "s" : ""); m->SetPosition(p); } } |