diff --git a/CONTRIBUTORS b/CONTRIBUTORS index c42ce644..edb2c43a 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -3022,6 +3022,8 @@ Frank Neumann for adding support for "Satellite Channel Routing" (SCR) according to EN50607 ("JESS") for suggesting to make the Setup/CAM menu display which device an individual CAM is currently assigned to + for reporting a problem with the default return value of cEpgHandler::BeginSegmentTransfer() + in derived classes that don't implement this function Gerald Dachs for reporting a problem with checking for minimum line length of 21 characters in diff --git a/HISTORY b/HISTORY index 86c5015e..983f6714 100644 --- a/HISTORY +++ b/HISTORY @@ -9012,3 +9012,6 @@ Video Disk Recorder Revision History - When selecting a device/CAM combination for live viewing, CAMs that are known to decrypt the requested channel are now given a higher priority than prefering the primary device (reported by Christian Winkler). +- Changed the default return value of cEpgHandler::BeginSegmentTransfer() to true, to + avoid problems with derived classes that don't implement this function (reported by + Frank Neumann). diff --git a/epg.h b/epg.h index 1341aa2e..949cd444 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.4 2017/04/02 11:22:21 kls Exp $ + * $Id: epg.h 4.5 2017/05/09 09:16:29 kls Exp $ */ #ifndef __EPG_H @@ -284,7 +284,7 @@ public: virtual bool DropOutdated(cSchedule *Schedule, time_t SegmentStart, time_t SegmentEnd, uchar TableID, uchar Version) { return false; } ///< Takes a look at all EPG events between SegmentStart and SegmentEnd and ///< drops outdated events. - virtual bool BeginSegmentTransfer(const cChannel *Channel, bool Dummy) { return false; } // TODO remove obsolete Dummy + virtual bool BeginSegmentTransfer(const cChannel *Channel, bool Dummy) { return true; } // TODO remove obsolete Dummy ///< Called directly after IgnoreChannel() before any other handler method is called. ///< Designed to give handlers the possibility to prepare a database transaction. ///< If any EPG handler returns false in this function, it is assumed that