From 8d3ae53bcd62ac659c3105b791ead80ed729b317 Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Sat, 1 Apr 2017 12:39:46 +0200 Subject: Changed tEventID back to u_int32_t --- CONTRIBUTORS | 1 + HISTORY | 7 ++++++- epg.h | 6 +++--- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/CONTRIBUTORS b/CONTRIBUTORS index e489cfca..564430e7 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -2619,6 +2619,7 @@ J for adding IsUpdate() to the EPG handler interface for adding Begin/EndSegmentTransfer() to the EPG handler interface for making cEpgHandlers::BeginSegmentTransfer() boolean + for suggesting to change tEventID back to u_int32_t Peter Pinnau for reporting that 'uint32_t' requires including stdint.h in font.h on some systems diff --git a/HISTORY b/HISTORY index 6af603f5..c72cc530 100644 --- a/HISTORY +++ b/HISTORY @@ -8925,10 +8925,15 @@ Video Disk Recorder Revision History - Now stopping any ongoing recordings before stopping the plugins, to avoid a crash when stopping VDR while recording. -2017-03-31: Version 2.3.4 +2017-04-01: Version 2.3.4 - The functionality of HandleRemoteModifications(), which synchronizes changes to timers between peer VDR machines, has been moved to timers.[ch] and renamed to HandleRemoteTimerModifications(). It now also handles deleting remote timers. - The function cEpgHandlers::BeginSegmentTransfer() is now boolean (thanks to Jörg Wendel). See the description in epg.h for the meaning of the return value. +- Changed tEventID back to u_int32_t (suggested by Jörg Wendel). The change to + u_int16_t in version 2.3.1 was ill-conceived, because the description of the + "event id" in vdr.5 explicitly mentioned this parameter to be 32 bit in size! + The members of cEvent have been slightly rearranged to minimize the memory + requirements on both 32 and 64 bit systems. diff --git a/epg.h b/epg.h index 024aac24..afadb82c 100644 --- a/epg.h +++ b/epg.h @@ -7,7 +7,7 @@ * Original version (as used in VDR before 1.3.0) written by * Robert Schneider and Rolf Hakenes . * - * $Id: epg.h 4.2 2017/03/31 15:24:35 kls Exp $ + * $Id: epg.h 4.3 2017/04/01 12:27:28 kls Exp $ */ #ifndef __EPG_H @@ -66,7 +66,7 @@ public: class cSchedule; -typedef u_int16_t tEventID; +typedef u_int32_t tEventID; class cEvent : public cListObject { friend class cSchedule; @@ -84,9 +84,9 @@ private: char *shortText; // Short description of this event (typically the episode name in case of a series) char *description; // Description of this event cComponents *components; // The stream components of this event - uchar contents[MaxEventContents]; // Contents of this event time_t startTime; // Start time of this event int duration; // Duration of this event in seconds + uchar contents[MaxEventContents]; // Contents of this event time_t vps; // Video Programming Service timestamp (VPS, aka "Programme Identification Label", PIL) time_t seen; // When this event was last seen in the data stream public: -- cgit v1.2.3