eit.c.rej

[martinez <martinez@xxxxxxx>]

Hi Udo,
Thanks a lot for the patch, I will try it as soon as I can compile 1.7.15 (currently on 1.7.13)


I am trying to apply the freesat uk patch to vdr 1.7.15 and there is a single .rej file (the rest are ok) and I am not sure how to handle this one
as there seem to be in 1.7.15 just one instance of  void cEitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length)

Any ideas?

freesat uk patch for vdr 1.7.x http://www.rst38.org.uk/vdr/freesat_20080927_vdr1.7.diff

and here follows the .rej file

***************
*** 318,328 ****
    Set(0x12, 0x50, 0xF0);  // event info, actual TS, schedule(0x50)/schedule for future days(0x5X)
    Set(0x12, 0x60, 0xF0);  // event info, other  TS, schedule(0x60)/schedule for future days(0x6X)
    Set(0x14, 0x70);        // TDT
  }
  
  void cEitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length)
  {
    switch (Pid) {
      case 0x12: {
           cSchedulesLock SchedulesLock(true, 10);
           cSchedules *Schedules = (cSchedules *)cSchedules::Schedules(SchedulesLock);
--- 318,333 ----
    Set(0x12, 0x50, 0xF0);  // event info, actual TS, schedule(0x50)/schedule for future days(0x5X)
    Set(0x12, 0x60, 0xF0);  // event info, other  TS, schedule(0x60)/schedule for future days(0x6X)
    Set(0x14, 0x70);        // TDT
+ 
   Set(3842, 0x4E, 0xFE);  // event info, actual(0x4E)/other(0x4F) TS, present/following
   Set(3842, 0x50, 0xF0);  // event info, actual TS, schedule(0x50)/schedule for future days(0x5X)
   Set(3842, 0x60, 0xF0);  // event info, other  TS, schedule(0x60)/schedule for future days(0x6X)
  }
  
  void cEitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length)
  {
    switch (Pid) {
+   case 3842:
      case 0x12: {
           cSchedulesLock SchedulesLock(true, 10);
           cSchedules *Schedules = (cSchedules *)cSchedules::Schedules(SchedulesLock);


_______________________________________________
vdr mailing list
vdr@xxxxxxxxxxx
http://www.linuxtv.org/cgi-bin/mailman/listinfo/vdr