From 708230bee9cc5a18ebaaf232801e9dcd4b746833 Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Sun, 3 Jan 2010 14:40:37 +0100 Subject: [PATCH] Rearranged cEvent members to minimize memory waste --- HISTORY | 1 + epg.h | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/HISTORY b/HISTORY index 605b0893..89043668 100644 --- a/HISTORY +++ b/HISTORY @@ -6266,3 +6266,4 @@ Video Disk Recorder Revision History the parental rating using the tag character 'R'. IMPORTANT NOTE: if VDR doesn't display a parental rating, this does not necessarily mean that the given programme is suitable for all audiences! +- Rearranged cEvent members to minimize memory waste. diff --git a/epg.h b/epg.h index 2f1f93c1..fbc9e061 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 2.2 2010/01/03 14:01:55 kls Exp $ + * $Id: epg.h 2.3 2010/01/03 14:39:14 kls Exp $ */ #ifndef __EPG_H @@ -67,17 +67,18 @@ typedef u_int32_t tEventID; class cEvent : public cListObject { friend class cSchedule; private: + // The sequence of these parameters is optimized for minimal memory waste! cSchedule *schedule; // The Schedule this event belongs to tEventID eventID; // Event ID of this event uchar tableID; // Table ID this event came from uchar version; // Version number of section this event came from - int runningStatus; // 0=undefined, 1=not running, 2=starts in a few seconds, 3=pausing, 4=running + uchar runningStatus; // 0=undefined, 1=not running, 2=starts in a few seconds, 3=pausing, 4=running + uchar parentalRating; // Parental rating of this event char *title; // Title of this event 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[MAXEVCONTENTS]; // Contents of this event - int parentalRating; // Parental rating of this event time_t startTime; // Start time of this event int duration; // Duration of this event in seconds time_t vps; // Video Programming Service timestamp (VPS, aka "Programme Identification Label", PIL)