diff mbox

Plugin: "undelete-0.0.2" does not compile with 1.3.25

Message ID 429CF66F.5030704@syphir.sytes.net
State New
Headers

Commit Message

C.Y.M May 31, 2005, 11:42 p.m. UTC 
  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,
diff mbox

Patch

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