From 40f4cef75ed6abffc68a01d1dd6ad132af17753c Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Sat, 25 Feb 2006 12:39:23 +0100
Subject: [PATCH] The 'info.vdr' file of a recording now also contains the 'E'
 and 'V' records of the EPG event

---
 HISTORY | 2 ++
 epg.c   | 7 +++----
 vdr.5   | 6 +++---
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/HISTORY b/HISTORY
index 8de1a40f..c250f869 100644
--- a/HISTORY
+++ b/HISTORY
@@ -4388,3 +4388,5 @@ Video Disk Recorder Revision History
   to the actual data.
 - The new function cRecordingInfo::ChannelID() can be used to retrieve the ID of
   the channel a recording was made from.
+- The 'info.vdr' file of a recording now also contains the 'E' and 'V' records of
+  the EPG event used when creating it.
diff --git a/epg.c b/epg.c
index 910333b1..6c8fea0e 100644
--- a/epg.c
+++ b/epg.c
@@ -7,7 +7,7 @@
  * Original version (as used in VDR before 1.3.0) written by
  * Robert Schneider <Robert.Schneider@web.de> and Rolf Hakenes <hakenes@hippomi.de>.
  *
- * $Id: epg.c 1.61 2006/02/19 12:50:26 kls Exp $
+ * $Id: epg.c 1.62 2006/02/25 12:30:27 kls Exp $
  */
 
 #include "epg.h"
@@ -249,8 +249,7 @@ cString cEvent::GetVpsString(void) const
 void cEvent::Dump(FILE *f, const char *Prefix, bool InfoOnly) const
 {
   if (InfoOnly || startTime + duration + Setup.EPGLinger * 60 >= time(NULL)) {
-     if (!InfoOnly)
-        fprintf(f, "%sE %u %ld %d %X %X\n", Prefix, eventID, startTime, duration, tableID, version);
+     fprintf(f, "%sE %u %ld %d %X %X\n", Prefix, eventID, startTime, duration, tableID, version);
      if (!isempty(title))
         fprintf(f, "%sT %s\n", Prefix, title);
      if (!isempty(shortText))
@@ -268,7 +267,7 @@ void cEvent::Dump(FILE *f, const char *Prefix, bool InfoOnly) const
             fprintf(f, "%sX %s\n", Prefix, *p->ToString());
             }
         }
-     if (!InfoOnly && vps)
+     if (vps)
         fprintf(f, "%sV %ld\n", Prefix, vps);
      if (!InfoOnly)
         fprintf(f, "%se\n", Prefix);
diff --git a/vdr.5 b/vdr.5
index 6171191c..1be01671 100644
--- a/vdr.5
+++ b/vdr.5
@@ -8,7 +8,7 @@
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.5 1.51 2006/02/25 12:18:59 kls Exp $
+.\" $Id: vdr.5 1.52 2006/02/25 12:39:23 kls Exp $
 .\"
 .TH vdr 5 "19 Feb 2006" "1.3.43" "Video Disk Recorder Files"
 .SH NAME
@@ -565,8 +565,8 @@ a description of the recording, derived from the EPG data at recording time
 (if such data was available). The \fBAux\fR field of the corresponding
 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 tags
-c, E, e and V will not appear in an \fIinfo.vdr\fR file.
+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.
 .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.