[vdr] Plugin: "undelete-0.0.2" does not compile with 1.3.25

Andreas Brugger brougs78 at gmx.net
Sun Jun 12 14:01:12 CEST 2005


Hi!

Thank you for the patch. I get two rejects in menuundelete.c here if I 
try the patch against a plain 0.0.2-version of the plugin. I've worked 
the rejects in and made a new patch which works here.

Bye,
Andreas Brugger


C.Y.M schrieb:

>C.Y.M wrote:
>  
>
>>Rainer Zocholl wrote:
>>
>>    
>>
>>>Hello
>>>
>>>undelete-0.0.2 does not compile anymore,
>>>does someone already have a patch?
>>>
>>>
>>>make[1]: Entering directory
>>>`/video/vdr-1.3.25.patched/PLUGINS/src/undelete-0.0.2'
>>>g++ -O2 -Wall -Woverloaded-virtual -g -c -DPLUGIN_NAME_I18N='"undelete"'
>>>-D_GNU_SOURCE -DUND_Debug1 -DUND_Debug2 -DUND_Debug3 -I../../../include
>>>-I../../../../DVB/include menuundelete.c
>>>menuundelete.c: In member function `void
>>>cMenuRecordingSelect::SetHelpKeys()':
>>>menuundelete.c:197: error: `Summary' undeclared (first use this function)
>>>menuundelete.c:197: error: (Each undeclared identifier is reported only once
>>>  for each function it appears in.)
>>>menuundelete.c: In member function èOSState cMenuRecordingSelect::Summary()':
>>>menuundelete.c:293: error: `Summary' undeclared (first use this function)
>>>make[1]: *** [menuundelete.o] Error 1
>>>make[1]: Leaving directory
>>>`/video/vdr-1.3.25.patched/PLUGINS/src/undelete-0.0.2'
>>>
>>>
>>>      
>>>
>>http://www.vdrportal.de/board/attachment.php?attachmentid=6165&sid=0598044b21d018b11b41d55fcdfb2802
>>
>>
>>    
>>
>Scratch that link.. the patch on vdrportal seems to have a few mistakes.  Here
>is one I just put together instead.
>
>Best Regards,
>  
>
>------------------------------------------------------------------------
>
>--- menuundelete.c.orig	2005-05-31 16:18:52.000000000 -0700
>+++ menuundelete.c	2005-05-31 16:33:59.000000000 -0700
>@@ -194,7 +194,11 @@
>     else
>     {
>       cRecording *recording = GetRecording(ri);
>+#if VDRVERSNUM >= 10325
>+      SetHelp(NULL, tr("Undelete"), tr("Delete"), (recording && recording->Info()->Description() && *recording->Info()->Description()) ? tr("Info") : NULL);
>+#else
>       SetHelp(NULL, tr("Undelete"), tr("Delete"), (recording && recording->Summary() && *recording->Summary()) ? tr("Summary") : NULL);
>+#endif
>     }
>   } else
>   {
>@@ -290,9 +294,17 @@
>   if (ri && !ri->IsDirectory())
>   {
>     cRecording *recording = GetRecording(ri);
>+#if VDRVERSNUM >= 10325
>+    if (recording && recording->Info()->Description() && *recording->Info()->Description())
>+#else
>     if (recording && recording->Summary() && *recording->Summary())
>+#endif
> #if VDRVERSNUM >= 10307
>+#if VDRVERSNUM >= 10325
>+      return AddSubMenu(new cMenuText(tr("Info"), recording->Info()->Description()));
>+#else
>       return AddSubMenu(new cMenuText(tr("Summary"), recording->Summary()));
>+#endif
> #else
>       return AddSubMenu(new cMenuItemText(tr("Summary"), recording->Summary()));
> #endif
>  
>
>------------------------------------------------------------------------
>
>_______________________________________________
>vdr mailing list
>vdr at linuxtv.org
>http://www.linuxtv.org/cgi-bin/mailman/listinfo/vdr
>  
>

-------------- next part --------------
diff -Nru undelete-0.0.2_plain/menuundelete.c undelete-0.0.2/menuundelete.c
--- undelete-0.0.2_plain/menuundelete.c	2004-10-10 12:23:20.000000000 +0200
+++ undelete-0.0.2/menuundelete.c	2005-06-12 13:34:08.000000000 +0200
@@ -193,8 +193,12 @@
       SetHelp(tr("Open"), tr("Undelete"), tr("Delete"), NULL);
     else
     {
-      cRecording *recording = GetRecording(ri);
-      SetHelp(NULL, tr("Undelete"), tr("Delete"), (recording && recording->Summary() && *recording->Summary()) ? tr("Summary") : NULL);
+        cRecording *recording = GetRecording(ri);
+#if VDRVERSNUM >= 10325
+        SetHelp(NULL, tr("Undelete"), tr("Delete"), (recording && recording->Info()->Description() && *recording->Info()->Description()) ? tr("Info") : NULL);
+#else
+        SetHelp(NULL, tr("Undelete"), tr("Delete"), (recording && recording->Summary() && *recording->Summary()) ? tr("Summary") : NULL);
+#endif
     }
   } else
   {
@@ -290,9 +294,17 @@
   if (ri && !ri->IsDirectory())
   {
     cRecording *recording = GetRecording(ri);
+#if VDRVERSNUM >= 10325
+    if (recording && recording->Info()->Description() && *recording->Info()->Description())
+#else
     if (recording && recording->Summary() && *recording->Summary())
+#endif
 #if VDRVERSNUM >= 10307
+#if VDRVERSNUM >= 10325
+      return AddSubMenu(new cMenuText(tr("Info"), recording->Info()->Description()));
+#else
       return AddSubMenu(new cMenuText(tr("Summary"), recording->Summary()));
+#endif
 #else
       return AddSubMenu(new cMenuItemText(tr("Summary"), recording->Summary()));
 #endif


More information about the vdr mailing list