Howto compile rotor in vdr-1.3.34?

Message ID 200510141307.42533.rollercoaster@reel-multimedia.com
State New
Headers

Commit Message

rollercoaster@reel-multimedia.com Oct. 14, 2005, 11:07 a.m. UTC
  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
  

Patch

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);