From patchwork Mon Jan 7 19:56:53 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arthur Konovalov X-Patchwork-Id: 12571 Received: from smtp-out.neti.ee ([194.126.126.40]) by www.linuxtv.org with esmtp (Exim 4.63) (envelope-from ) id 1JBy5u-0000Up-Ic for vdr@linuxtv.org; Mon, 07 Jan 2008 20:57:10 +0100 Received: from localhost (localhost [127.0.0.1]) by MXR-13.estpak.ee (Postfix) with ESMTP id 0610412834 for ; Mon, 7 Jan 2008 21:56:55 +0200 (EET) X-Virus-Scanned: amavisd-new at !change-mydomain-variable!.example.com Received: from smtp-out.neti.ee ([127.0.0.1]) by localhost (MXR-1.estpak.ee [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id KVDbnlkpU+m0 for ; Mon, 7 Jan 2008 21:56:53 +0200 (EET) Received: from Relayhost2.neti.ee (Relayhost2 [88.196.174.142]) by MXR-13.estpak.ee (Postfix) with ESMTP id 9DF6911F43 for ; Mon, 7 Jan 2008 21:56:53 +0200 (EET) Message-ID: <47828405.30805@hot.ee> Date: Mon, 07 Jan 2008 21:56:53 +0200 From: Arthur Konovalov User-Agent: Thunderbird 2.0.0.9 (Windows/20071031) MIME-Version: 1.0 To: VDR Mailing List References: In-Reply-To: Subject: Re: [vdr] Rotor patch for 1.5.12 X-BeenThere: vdr@linuxtv.org X-Mailman-Version: 2.1.9 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, 07 Jan 2008 19:57:11 -0000 Status: O X-Status: X-Keywords: X-UID: 15014 spe@sdmonv.com wrote: > I am looking for the patch to compile the rotor plugin together with > vdr-1.5.12. > > Does anyone achieved to compile it with 1.5.12 I had success with attached patch. Regards, AK diff -ur rotor-0.1.4/filter.c rotor-0.1.4_vdr-1.5.10/filter.c --- rotor-0.1.4/filter.c 2007-10-14 11:37:13.000000000 +0200 +++ rotor-0.1.4_vdr-1.5.10/filter.c 2007-10-15 22:56:43.000000000 +0200 @@ -368,12 +368,15 @@ int Ppid = pmt.getPCRPid(); int Apids[MAXAPIDS + 1] = { 0 }; int Dpids[MAXDPIDS + 1] = { 0 }; + int Spids[MAXDPIDS + 1] = { 0 }; #if VDRVERSNUM >= 10332 char ALangs[MAXAPIDS + 1][MAXLANGCODE2] = { "" }; char DLangs[MAXDPIDS + 1][MAXLANGCODE2] = { "" }; + char SLangs[MAXDPIDS + 1][MAXLANGCODE2] = { "" }; #else char ALangs[MAXAPIDS + 1][4] = { "" }; char DLangs[MAXDPIDS + 1][4] = { "" }; + char SLangs[MAXDPIDS + 1][4] = { "" }; #endif int Tpid = 0; int NumApids = 0; @@ -448,7 +451,7 @@ delete d; } } - Menu->SetPids(pmt.getServiceId(),Vpid, Vpid ? Ppid : 0, Apids, ALangs, Dpids, DLangs, Tpid); + Menu->SetPids(pmt.getServiceId(),Vpid, Vpid ? Ppid : 0, Apids, ALangs, Dpids, DLangs, Spids, SLangs, Tpid); Menu->SetCaIds(pmt.getServiceId(),CaDescriptors->CaIds()); Menu->SetCaDescriptors(pmt.getServiceId(),CaDescriptorHandler.AddCaDescriptors(CaDescriptors)); } diff -ur rotor-0.1.4/menu.c rotor-0.1.4_vdr-1.5.10/menu.c --- rotor-0.1.4/menu.c 2007-10-14 11:37:12.000000000 +0200 +++ rotor-0.1.4_vdr-1.5.10/menu.c 2007-10-15 22:55:27.000000000 +0200 @@ -406,12 +406,15 @@ channel->SetId(Channel[Num].Nid(),Channel[Num].Tid(),Channel[Num].Sid(),channel->Rid()); int Apids[MAXAPIDS + 1] = { 0 }; int Dpids[MAXDPIDS + 1] = { 0 }; + int Spids[MAXDPIDS + 1] = { 0 }; #if VDRVERSNUM>=10332 char ALangs[MAXAPIDS + 1][MAXLANGCODE2] = { "" }; char DLangs[MAXDPIDS + 1][MAXLANGCODE2] = { "" }; + char SLangs[MAXDPIDS + 1][MAXLANGCODE2] = { "" }; #else char ALangs[MAXAPIDS + 1][4] = { "" }; char DLangs[MAXDPIDS + 1][4] = { "" }; + char SLangs[MAXDPIDS + 1][4] = { "" }; #endif int CaIds[MAXCAIDS+1] = { 0 }; for (int i=0; i<=MAXAPIDS; i++) @@ -426,7 +429,7 @@ } for (int i=0; i<=MAXCAIDS; i++) CaIds[i]=Channel[Num].Ca(i); - channel->SetPids(Channel[Num].Vpid(),Channel[Num].Ppid(),Apids,ALangs,Dpids,DLangs,Channel[Num].Tpid()); + channel->SetPids(Channel[Num].Vpid(),Channel[Num].Ppid(),Apids,ALangs,Dpids,DLangs,Spids,SLangs,Channel[Num].Tpid()); channel->SetCaIds(CaIds); } else @@ -456,7 +459,7 @@ } #if VDRVERSNUM>=10332 -void cMenuScan::SetPids(int Sid,int Vpid, int Ppid, int *Apids, char ALangs[][MAXLANGCODE2], int *Dpids, char DLangs[][MAXLANGCODE2], int Tpid) +void cMenuScan::SetPids(int Sid,int Vpid, int Ppid, int *Apids, char ALangs[][MAXLANGCODE2], int *Dpids, char DLangs[][MAXLANGCODE2], int *Spids, char SLangs[][MAXLANGCODE2], int Tpid) #else void cMenuScan::SetPids(int Sid,int Vpid, int Ppid, int *Apids, char ALangs[][4], int *Dpids, char DLangs[][4], int Tpid) #endif @@ -464,7 +467,7 @@ for (int i=0; i