diff options
| -rw-r--r-- | HISTORY | 1 | ||||
| -rw-r--r-- | epg.c | 32 | ||||
| -rw-r--r-- | epg.h | 13 |
3 files changed, 3 insertions, 43 deletions
@@ -2680,3 +2680,4 @@ Video Disk Recorder Revision History correctly - and some (like RTL, for instance) even change the ID of the same event randomly, making it impossible for a timer to be programmed on a ceartain event rather than a specific time. Well, let's see where this leads us... +- Removed the obsolete 'present' and 'following' handling from the EPG data. @@ -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.6 2004/02/21 12:21:18 kls Exp $ + * $Id: epg.c 1.7 2004/02/21 12:32:31 kls Exp $ */ #include "epg.h" @@ -24,7 +24,6 @@ cEvent::cEvent(tChannelID ChannelID, u_int16_t EventID) tableID = 0; version = 0xFF; // actual version numbers are 0..31 runningStatus = 0; - isPresent = isFollowing = false; title = NULL; shortText = NULL; description = NULL; @@ -60,16 +59,6 @@ void cEvent::SetRunningStatus(int RunningStatus) runningStatus = RunningStatus; } -void cEvent::SetIsPresent(bool IsPresent) -{ - isPresent = IsPresent; -} - -void cEvent::SetIsFollowing(bool IsFollowing) -{ - isFollowing = IsFollowing; -} - void cEvent::SetTitle(const char *Title) { title = strcpyrealloc(title, Title); @@ -439,7 +428,6 @@ void cEvent::FixEpgBugs(void) cSchedule::cSchedule(tChannelID ChannelID) { channelID = ChannelID; - present = following = NULL; } cEvent *cSchedule::AddEvent(cEvent *Event) @@ -506,24 +494,6 @@ void cSchedule::SetRunningStatus(cEvent *Event, int RunningStatus) } } -bool cSchedule::SetPresentEvent(cEvent *Event) -{ - if (present) - present->SetIsPresent(false); - present = Event; - present->SetIsPresent(true); - return true; -} - -bool cSchedule::SetFollowingEvent(cEvent *Event) -{ - if (following) - following->SetIsFollowing(false); - following = Event; - following->SetIsFollowing(true); - return true; -} - void cSchedule::ResetVersions(void) { for (cEvent *p = events.First(); p; p = events.Next(p)) @@ -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.h 1.5 2004/02/21 12:12:05 kls Exp $ + * $Id: epg.h 1.6 2004/02/21 12:31:43 kls Exp $ */ #ifndef __EPG_H @@ -28,9 +28,6 @@ private: 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 - //XXX present/following obsolete??? - bool isPresent; // true if this is the present event running - bool isFollowing; // true if this is the next event on this channel 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 @@ -46,8 +43,6 @@ public: uchar TableID(void) const { return tableID; } uchar Version(void) const { return version; } int RunningStatus(void) const { return runningStatus; } - bool IsPresent(void) const { return isPresent; } - bool IsFollowing(void) const { return isFollowing; } const char *Title(void) const { return title; } const char *ShortText(void) const { return shortText; } const char *Description(void) const { return description; } @@ -61,8 +56,6 @@ public: void SetTableID(uchar TableID); void SetVersion(uchar Version); void SetRunningStatus(int RunningStatus); - void SetIsPresent(bool IsPresent); - void SetIsFollowing(bool IsFollowing); void SetTitle(const char *Title); void SetShortText(const char *ShortText); void SetDescription(const char *Description); @@ -80,14 +73,10 @@ class cSchedule : public cListObject { private: tChannelID channelID; cList<cEvent> events; - cEvent *present; - cEvent *following; public: cSchedule(tChannelID ChannelID); tChannelID ChannelID(void) const { return channelID; } void SetRunningStatus(cEvent *Event, int RunningStatus); - bool SetPresentEvent(cEvent *Event); - bool SetFollowingEvent(cEvent *Event); void ResetVersions(void); void Cleanup(time_t Time); void Cleanup(void); |