From 251e04d25a9e8ae5ea92b87fc570aee473625c03 Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Sun, 29 Jan 2006 11:31:58 +0100 Subject: [PATCH] When reading epg.data (or data from PUTE), the version number of events with table IDs smaller than 0x50 is now ignored --- HISTORY | 3 +++ epg.c | 5 +++-- vdr.5 | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/HISTORY b/HISTORY index 3f4fe643..ec343721 100644 --- a/HISTORY +++ b/HISTORY @@ -4260,3 +4260,6 @@ Video Disk Recorder Revision History - Changed DVBS_TUNE_TIMEOUT and DVBC_TUNE_TIMEOUT to 9000ms to avoid problems with channels that have low symbol rates (reported by Suur Karu). - Fixed displaying the current audio track in the channel display. +- When reading epg.data (or data from PUTE), the version number of events with + table IDs smaller than 0x50 is now ignored because otherwise the current + running status would not be set after a restart of VDR. diff --git a/epg.c b/epg.c index 40cd3539..8cb39e81 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 and Rolf Hakenes . * - * $Id: epg.c 1.53 2006/01/28 14:45:24 kls Exp $ + * $Id: epg.c 1.54 2006/01/29 11:27:43 kls Exp $ */ #include "epg.h" @@ -309,7 +309,8 @@ bool cEvent::Read(FILE *f, cSchedule *Schedule) Event = newEvent = new cEvent(EventID); if (Event) { Event->SetTableID(TableID); - Event->SetVersion(Version); + if (TableID >= 0x50) // makes sure the running status flag is set from the actual data stream + Event->SetVersion(Version); Event->SetStartTime(StartTime); Event->SetDuration(Duration); if (newEvent) diff --git a/vdr.5 b/vdr.5 index caabe51c..214aac81 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.47 2006/01/14 10:57:37 kls Exp $ +.\" $Id: vdr.5 1.48 2006/01/29 11:31:58 kls Exp $ .\" .TH vdr 5 "08 Jan 2006" "1.3.38" "Video Disk Recorder Files" .SH NAME @@ -635,7 +635,7 @@ l l. @is the time (as a time_t integer) in UTC when this event starts @is the time (in seconds) that this event will take @is a hex number that indicates the table this event is contained in (if this is left empty or 0 this event will not be overwritten or modified by data that comes from the DVB stream) - @is a hex number that indicates the event's version number inside its table (optional) + @is a hex number that indicates the event's version number inside its table (optional, only processed for table IDs smaller than 0x50) @is the title of the event <short text> @is the short text of the event (typically the name of the episode etc.) <description> @is the description of the event (any '|' characters will be interpreted as newlines)