Re: [vdr] eit.c.rej

2010-06-21 Thread Dominic Evans 

On 21/06/10 08:19, martinez wrote:

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?


vdr 1.7.9 reworked this code [1] and the patch needs to be updated to match

try this rebased patch for vdr 1.7.15:
   http://gist.github.com/446643

Cheers,
Dom

[1] 
http://git.gekrumbel.de/?p=vdr.git;a=commitdiff;h=06bf4c453e22a9bf03f5ec46f7b45593e2cb326c#patch8



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

Re: [vdr] eit.c.rej

2010-06-21 Thread André Weidemann 

Hi,
On 21.06.2010 09:19, martinez wrote:

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?



Apply the attached patch to a clean eit.c and see if it works.

Regards
 André

--- eit.c   2010-05-14 16:08:35.0 +0200
+++ /tftpboot/vdr-debian-w7/usr/local/src/VDR/eit.c 2010-06-10 
15:03:03.873522835 +0200
@@ -358,6 +358,9 @@
   Set(0x12, 0x40, 0xC0);  // event info now&next actual/other TS (0x4E/0x4F), 
future actual/other TS (0x5X/0x6X)
   if (Setup.SetSystemTime && Setup.TimeTransponder)
  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::SetDisableUntil(time_t Time)
@@ -374,6 +377,7 @@
 return;
  }
   switch (Pid) {
+case 3842:
 case 0x12: {
  if (Tid >= 0x4E && Tid <= 0x6F) {
 cSchedulesLock SchedulesLock(true, 10);
___
vdr mailing list
vdr@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/vdr