From patchwork Fri Oct 14 11:07:42 2005
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: rollercoaster@reel-multimedia.com
X-Patchwork-Id: 12062
Received: from 213-239-210-49.clients.your-server.de
	([213.239.210.49] helo=reelbox.de ident=postfix)
	by www.linuxtv.org with esmtp (Exim 4.50) id 1EQNPe-0004RB-JG
	for vdr@linuxtv.org; Fri, 14 Oct 2005 13:07:46 +0200
Received: from RollerCoaster (p5496E711.dip.t-dialin.net [84.150.231.17])
	by reelbox.de (Postfix) with ESMTP id 86547804005
	for <vdr@linuxtv.org>; Fri, 14 Oct 2005 13:07:43 +0200 (CEST)
From: rollercoaster@reel-multimedia.com
Organization: Reel Multimedia AG
To: Klaus Schmidinger's VDR <vdr@linuxtv.org>
Subject: Re: [vdr] Howto compile rotor in vdr-1.3.34?
Date: Fri, 14 Oct 2005 13:07:42 +0200
User-Agent: KMail/1.7.1
References: <434F8D93.4010100@fastmail.fm>
In-Reply-To: <434F8D93.4010100@fastmail.fm>
MIME-Version: 1.0
Message-Id: <200510141307.42533.rollercoaster@reel-multimedia.com>
X-BeenThere: vdr@linuxtv.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: Klaus Schmidinger's VDR <vdr@linuxtv.org>
List-Id: Klaus Schmidinger's VDR <vdr.linuxtv.org>
List-Unsubscribe: <http://www.linuxtv.org/cgi-bin/mailman/listinfo/vdr>,
	<mailto:vdr-request@linuxtv.org?subject=unsubscribe>
List-Archive: <http://www.linuxtv.org/pipermail/vdr>
List-Post: <mailto:vdr@linuxtv.org>
List-Help: <mailto:vdr-request@linuxtv.org?subject=help>
List-Subscribe: <http://www.linuxtv.org/cgi-bin/mailman/listinfo/vdr>,
	<mailto:vdr-request@linuxtv.org?subject=subscribe>
X-List-Received-Date: Fri, 14 Oct 2005 11:07:46 -0000
Status: O
X-Status: 
X-Keywords: 
X-UID: 5490

Am Freitag, 14. Oktober 2005 12:50 schrieb Suur Karu:
> Hi!
> Is there any patch to compile rotor-0.1.1 plugin with vdr-1.3.34?

here you are. we did't make any #if VDRVERSNUM (because we are lazy guys ;) ) 
but one can do this easily by himself.

regards,
thiemo

diff -Nur -x.svn rotor-0.1.1-vanilla/filter.c rotor-0.1.1/filter.c
--- rotor-0.1.1-vanilla/filter.c	2005-09-03 08:59:03.000000000 +0200
+++ rotor-0.1.1/filter.c	2005-10-05 14:36:04.000000000 +0200
@@ -1,7 +1,7 @@
 #include "filter.h"
 #include <malloc.h>
-#include "../../../libsi/section.h"
-#include "../../../libsi/descriptor.h"
+#include "libsi/section.h"
+#include "libsi/descriptor.h"
 #include <vdr/channels.h>
 
 // --- cCaDescriptor ---------------------------------------------------------
@@ -368,8 +368,8 @@
         int Ppid = pmt.getPCRPid();
         int Apids[MAXAPIDS + 1] = { 0 };
         int Dpids[MAXDPIDS + 1] = { 0 };
-        char ALangs[MAXAPIDS + 1][4] = { "" };
-        char DLangs[MAXDPIDS + 1][4] = { "" };
+        char ALangs[MAXAPIDS + 1][MAXLANGCODE2] = { "" };
+        char DLangs[MAXDPIDS + 1][MAXLANGCODE2] = { "" };
         int Tpid = 0;
         int NumApids = 0;
         int NumDpids = 0;
diff -Nur -x.svn rotor-0.1.1-vanilla/menu.c rotor-0.1.1/menu.c
--- rotor-0.1.1-vanilla/menu.c	2005-09-05 10:01:46.000000000 +0200
+++ rotor-0.1.1/menu.c	2005-10-05 14:30:38.000000000 +0200
@@ -312,8 +312,8 @@
     channel->SetId(Channel[Num].Nid(),Channel[Num].Tid(),Channel[Num].Sid(),channel->Rid());
     int Apids[MAXAPIDS + 1] = { 0 };
     int Dpids[MAXDPIDS + 1] = { 0 };
-    char ALangs[MAXAPIDS + 1][4] = { "" };
-    char DLangs[MAXDPIDS + 1][4] = { "" };
+    char ALangs[MAXAPIDS + 1][MAXLANGCODE2] = { "" };
+    char DLangs[MAXDPIDS + 1][MAXLANGCODE2] = { "" };
     int CaIds[MAXCAIDS+1] = { 0 };
     for (int i=0; i<=MAXAPIDS; i++)
     {
@@ -352,7 +352,7 @@
   num++;
 }
 
-void cMenuScan::SetPids(int Sid,int Vpid, int Ppid, int *Apids, char ALangs[][4], int *Dpids, char DLangs[][4], int Tpid)
+void cMenuScan::SetPids(int Sid,int Vpid, int Ppid, int *Apids, char ALangs[][MAXLANGCODE2], int *Dpids, char DLangs[][MAXLANGCODE2], int Tpid)
 {
   for (int i=0; i<num; i++)
     if (Sid==Channel[i].Sid())
diff -Nur -x.svn rotor-0.1.1-vanilla/menu.h rotor-0.1.1/menu.h
--- rotor-0.1.1-vanilla/menu.h	2005-09-05 10:03:29.000000000 +0200
+++ rotor-0.1.1/menu.h	2005-10-05 14:31:13.000000000 +0200
@@ -73,7 +73,7 @@
   virtual eOSState ProcessKey(eKeys Key);
   void AddChannel(int Num);
   void NewChannel(const cChannel *Transponder, const char *Name, const char *ShortName, const char *Provider, int Nid, int Tid, int Sid);
-  void SetPids(int Sid,int Vpid, int Ppid, int *Apids, char ALangs[][4], int *Dpids, char DLangs[][4], int Tpid);
+  void SetPids(int Sid,int Vpid, int Ppid, int *Apids, char ALangs[][MAXLANGCODE2], int *Dpids, char DLangs[][MAXLANGCODE2], int Tpid);
   void SetCaIds(int Sid,const int *CaIds);
   void SetCaDescriptors(int Sid,int Level);
   cChannel* GetChannel(int Sid);