Lines tagged with '#' in the 'info.vdr' file of a recording are now silently ignored when reading that file

This commit is contained in:
Klaus Schmidinger 2006-02-26 12:03:28 +01:00
parent 655b2297b9
commit 168348e7e4
4 changed files with 9 additions and 2 deletions

View File

@ -978,6 +978,7 @@ Peter Bieringer <pb@bieringer.de>
for reporting a leftover 'summary.vdr' in vdr.5
for adding more error messages and line numbers when reading EPG data and info.vdr
for fixing handling "more than 3 byte" key sequences in cKbdRemote::ReadKeySequence()
for suggesting to ignore lines tagged with '#' in the 'info.vdr' file of a recording
Alexander Damhuis <ad@phonedation.de>
for reporting problems when deleting a timer that is currently recording

View File

@ -4404,3 +4404,6 @@ Video Disk Recorder Revision History
- Fixed setting events to timers in case a non-VPS event has expired.
- There is now a log message "timer ... set to event ..." when defining a timer
from the EPG menu.
- Lines tagged with '#' in the 'info.vdr' file of a recording are now silently
ignored when reading that file (suggested by Peter Bieringer). Such lines can
be used by external tools to store arbitrary information.

View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
* $Id: recording.c 1.139 2006/02/25 17:05:48 kls Exp $
* $Id: recording.c 1.140 2006/02/26 11:59:59 kls Exp $
*/
#include "recording.h"
@ -356,6 +356,7 @@ bool cRecordingInfo::Read(FILE *f)
case '@': free(aux);
aux = strdup(t);
break;
case '#': break; // comments are ignored
default: if (!ownEvent->Parse(s)) {
esyslog("ERROR: EPG data problem in line %d", line);
return false;

4
vdr.5
View File

@ -8,7 +8,7 @@
.\" License as specified in the file COPYING that comes with the
.\" vdr distribution.
.\"
.\" $Id: vdr.5 1.52 2006/02/25 12:39:23 kls Exp $
.\" $Id: vdr.5 1.53 2006/02/26 12:01:21 kls Exp $
.\"
.TH vdr 5 "19 Feb 2006" "1.3.43" "Video Disk Recorder Files"
.SH NAME
@ -567,6 +567,8 @@ timer (if given) is copied into this file, using the '@' tag.
This is a plain ASCII file and contains tagged lines like the \fBEPG DATA\fR
file (see the description of the \fIepg.data\fR file). Note that the lowercase
tags ('c' and 'e') will not appear in an \fIinfo.vdr\fR file.
Lines tagged with '#' are ignored and can be used by external tools to
store arbitrary information.
.SS RESUME
The file \fIresume.vdr\fR (if present in a recording directory) contains
the position within the recording where the last replay session left off.