From patchwork Tue May 31 23:42:39 2005 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "C.Y.M" X-Patchwork-Id: 11901 Received: from zproxy.gmail.com ([64.233.162.192]) by www.linuxtv.org with esmtp (Exim 4.34) id 1DdGOM-0006Ni-QU for vdr@linuxtv.org; Wed, 01 Jun 2005 01:43:26 +0200 Received: by zproxy.gmail.com with SMTP id 13so1786111nzn for ; Tue, 31 May 2005 16:42:55 -0700 (PDT) DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=beta; d=gmail.com; h=received:message-id:disposition-notification-to:date:reply-to:organization:user-agent:x-accept-language:mime-version:to:subject:references:in-reply-to:x-enigmail-version:x-enigmail-supports:content-type:from; b=UEQDpfJGXQradJr3XCKudhP48aO9zvheRB0eiWOylmolXK1L1+mtFmNPFWHl25i85DBQNxounqvXZ+qTPUlRlsAAsV9eVVoYIdfAYOjt/b8Le+I6LCrO/4F24iOC5rMHYFDbI/RgO9l8nvLLmNOSdMFgJNTlPzJ80jxoN6Ea87M= Received: by 10.36.71.16 with SMTP id t16mr2612328nza; Tue, 31 May 2005 16:42:54 -0700 (PDT) Received: from nofear.bounceme.net ([4.246.108.172]) by mx.gmail.com with ESMTP id 17sm167842nzo.2005.05.31.16.42.51; Tue, 31 May 2005 16:42:54 -0700 (PDT) Received: from [10.1.1.66] (hades [10.1.1.66]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by nofear.bounceme.net (Postfix) with ESMTP id 5F1C173534 for ; Tue, 31 May 2005 16:42:47 -0700 (PDT) Message-ID: <429CF66F.5030704@syphir.sytes.net> Date: Tue, 31 May 2005 16:42:39 -0700 Organization: CooLNeT User-Agent: Mozilla Thunderbird 1.0 (Windows/20041206) X-Accept-Language: en-us, en MIME-Version: 1.0 To: Klaus Schmidinger's VDR Subject: Re: [vdr] Plugin: "undelete-0.0.2" does not compile with 1.3.25 References: <9Y3lJJFMgjB@zocki.toppoint.de> <429CEB25.3030007@syphir.sytes.net> In-Reply-To: <429CEB25.3030007@syphir.sytes.net> X-Enigmail-Version: 0.90.2.0 X-Enigmail-Supports: pgp-inline, pgp-mime From: "C.Y.M" X-BeenThere: vdr@linuxtv.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: syphir@syphir.sytes.net, Klaus Schmidinger's VDR List-Id: Klaus Schmidinger's VDR List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 May 2005 23:43:27 -0000 Status: O X-Status: X-Keywords: X-UID: 2656 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