From patchwork Mon Jun 21 09:38:54 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andr=C3=A9_Weidemann?= X-Patchwork-Id: 12823 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.69) (envelope-from ) id 1OQdTB-0007KG-EV for vdr@linuxtv.org; Mon, 21 Jun 2010 11:39:10 +0200 X-tubIT-Incoming-IP: 217.72.192.227 Received: from fmmailgate02.web.de ([217.72.192.227]) by mail.tu-berlin.de (exim-4.69/mailfrontend-c) with esmtp for id 1OQdT7-00062l-4t; Mon, 21 Jun 2010 11:39:07 +0200 Received: from smtp07.web.de ( [172.20.5.215]) by fmmailgate02.web.de (Postfix) with ESMTP id E7CE416858489; Mon, 21 Jun 2010 11:39:02 +0200 (CEST) Received: from [80.88.21.211] (helo=[127.0.0.1]) by smtp07.web.de with asmtp (TLSv1:AES256-SHA:256) (WEB.DE 4.110 #4) id 1OQdT4-0006uv-00; Mon, 21 Jun 2010 11:39:02 +0200 Message-ID: <4C1F332E.7090707@web.de> Date: Mon, 21 Jun 2010 11:38:54 +0200 From: =?ISO-8859-1?Q?Andr=E9_Weidemann?= User-Agent: Mozilla/5.0 (Windows; U; Windows NT 6.0; en-US; rv:1.9.1.10) Gecko/20100512 Lightning/1.0b1 Thunderbird/3.0.5 MIME-Version: 1.0 To: VDR Mailing List References: In-Reply-To: Sender: Andre.Weidemann@web.de X-Sender: Andre.Weidemann@web.de X-Provags-ID: V01U2FsdGVkX1+Ok7c2AiiH6dScKJCn64b3HioFmIlSbO0Z/PXY +KmhCzQ+mtzxxo+u31x79amdrNtpKwfglTZFnAC5EI2SuUpzbT GrQWsn9GneL837mbe13Q== X-tubIT-Score: 0.0 () X-PMX-Version: 5.5.4.371499, Antispam-Engine: 2.7.1.369594, Antispam-Data: 2010.6.21.92713 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' MIME_TEXT_ONLY_MP_MIXED 0.05, MSGID_ADDED_BY_MTA 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_1800_1899 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, __BAT_BOUNDARY 0, __BOUNCE_CHALLENGE_SUBJ 0, __BOUNCE_NDR_SUBJ_EXEMPT 0, __CT 0, __CTYPE_HAS_BOUNDARY 0, __CTYPE_MULTIPART 0, __CTYPE_MULTIPART_MIXED 0, __HAS_MSGID 0, __MIME_TEXT_ONLY 0, __MIME_VERSION 0, __MOZILLA_MSGID 0, __SANE_MSGID 0, __TO_MALFORMED_2 0, __URI_NO_MAILTO 0, __URI_NO_PATH 0, __URI_NO_WWW 0, __USER_AGENT 0' X-LSpam-Score: -3.3 (---) X-LSpam-Report: No, score=-3.3 required=5.0 tests=AWL=0.307, BAYES_00=-2.599, RCVD_IN_DNSWL_LOW=-1 autolearn=ham Cc: martinez Subject: Re: [vdr] eit.c.rej X-BeenThere: vdr@linuxtv.org X-Mailman-Version: 2.1.11 Precedence: list Reply-To: VDR Mailing List List-Id: VDR Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Jun 2010 09:39:10 -0000 Status: O X-Status: X-Keywords: X-UID: 23090 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.000000000 +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);