Removed EPGBugfixLevel '3'

HISTORY

@@ -890,3 +890,5 @@ Video Disk Recorder Revision History
 - Prepared the OSD functions for multiple overlapping windows.
 - Removed the check to see whether the system time is running linearly.
 - Improved performance of SVDRP command entry.
+- Removed EPGBugfixLevel '3' - after more than a year Pro-7 finally managed to
+  broadcast the correct timestamps for EPG events between 0:00 and 6:00!

MANUAL

@@ -402,12 +402,7 @@ Video Disk Recorder User's Manual
                              Extended Description)
                          2 = removal of excess whitespace and hyphens, mapping of
                              wrongly used characters
-                         3 = fixing the date in timestamps between 00:00 and 06:00
+                         Default is '2'.
-                             (use with care - hopefully one day Pro7 and Kabel1
-                             will learn how to read the clock/calender)
-                         Default is '2', which will do all textual fixes, but
-                         leaves out the timestamp fixes, since these might cause
-                         recordings to fail. Use '3' at your own risk.
                          Note that after changing the setting of this parameter
                          any EPG data that has already been received will remain
                          in its existing format - only newly received data will

eit.c

@@ -16,7 +16,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- * $Id: eit.c 1.30 2001/12/01 14:33:04 kls Exp $
+ * $Id: eit.c 1.31 2002/01/13 16:14:31 kls Exp $
  ***************************************************************************/
 
 #include "eit.h"
@@ -473,22 +473,6 @@ void cEventInfo::FixEpgBugs(void)
      strreplace(pTitle, '`', '\'');
      strreplace(pSubtitle, '`', '\'');
      strreplace(pExtendedDescription, '`', '\'');
-
-     if (Setup.EPGBugfixLevel <= 2)
-        return;
-
-     // Pro7 and Kabel1 apparently are unable to use a calendar/clock,
-     // because all events between 00:00 and 06:00 have the date of the
-     // day before (sometimes even this correction doesn't help).
-     // Channels are recognized by their ServiceID, which may only work
-     // correctly on the ASTRA satellite system.
-     if (uServiceID == 898    // Pro-7
-      || uServiceID == 899) { // Kabel 1
-        struct tm tm_r;
-        tm *t = localtime_r(&tTime, &tm_r);
-        if (t->tm_hour * 3600 + t->tm_min * 60 + t->tm_sec <= 6 * 3600)
-           tTime += 24 * 3600;
-        }
      }
 }
 

eit.h

@@ -16,7 +16,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- * $Id: eit.h 1.12 2001/10/28 12:33:10 kls Exp $
+ * $Id: eit.h 1.13 2002/01/13 16:18:23 kls Exp $
  ***************************************************************************/
 
 #ifndef __EIT_H
@@ -25,6 +25,8 @@
 #include "thread.h"
 #include "tools.h"
 
+#define MAXEPGBUGFIXLEVEL 2
+
 class cEventInfo : public cListObject {
   friend class cSchedule;
   friend class cEIT;

menu.c

@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.141 2001/11/24 13:20:37 kls Exp $
+ * $Id: menu.c 1.142 2002/01/13 16:18:40 kls Exp $
  */
 
 #include "menu.h"
@@ -1712,7 +1712,7 @@ void cMenuSetup::Set(void)
   Add(new cMenuEditIntItem( tr("MarginStart"),        &data.MarginStart));
   Add(new cMenuEditIntItem( tr("MarginStop"),         &data.MarginStop));
   Add(new cMenuEditIntItem( tr("EPGScanTimeout"),     &data.EPGScanTimeout));
-  Add(new cMenuEditIntItem( tr("EPGBugfixLevel"),     &data.EPGBugfixLevel, 0, 3));
+  Add(new cMenuEditIntItem( tr("EPGBugfixLevel"),     &data.EPGBugfixLevel, 0, MAXEPGBUGFIXLEVEL));
   Add(new cMenuEditIntItem( tr("SVDRPTimeout"),       &data.SVDRPTimeout));
   Add(new cMenuEditBoolItem(tr("SortTimers"),         &data.SortTimers));
   Add(new cMenuEditIntItem( tr("PrimaryLimit"),       &data.PrimaryLimit, 0, MAXPRIORITY));