From patchwork Sun Jan 9 00:13:21 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: jdobry@centrum.cz X-Patchwork-Id: 12858 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.69) (envelope-from ) id 1PbiuU-0007WI-Mf for vdr@linuxtv.org; Sun, 09 Jan 2011 01:13:27 +0100 X-tubIT-Incoming-IP: 89.235.36.82 Received: from link-v.kaznejov.cz ([89.235.36.82]) by mail.tu-berlin.de (exim-4.73/mailfrontend-a) with esmtps [TLSv1:AES256-SHA:256] for id 1PbiuT-0005Wp-CT; Sun, 09 Jan 2011 01:13:26 +0100 Received: from localhost (localhost [127.0.0.1]) by link-v.kaznejov.cz (Postfix) with ESMTP id 36ACC31876 for ; Sun, 9 Jan 2011 01:13:25 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at kaznejov.cz Received: from link-v.kaznejov.cz ([127.0.0.1]) by localhost (link-v.kaznejov.cz [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id n0wboCNNLgWg for ; Sun, 9 Jan 2011 01:13:22 +0100 (CET) Received: from [192.168.62.234] (unknown [192.168.62.234]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: jirik) by link-v.kaznejov.cz (Postfix) with ESMTPSA id 290B31D72D for ; Sun, 9 Jan 2011 01:13:22 +0100 (CET) Message-ID: <4D28FDA1.1040405@centrum.cz> Date: Sun, 09 Jan 2011 01:13:21 +0100 From: jdobry@centrum.cz User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.13) Gecko/20101208 Thunderbird/3.1.7 MIME-Version: 1.0 To: vdr@linuxtv.org References: <4D28E5B7.1020405@centrum.cz> In-Reply-To: <4D28E5B7.1020405@centrum.cz> X-PMX-Version: 5.5.4.371499, Antispam-Engine: 2.7.1.369594, Antispam-Data: 2011.1.9.616 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' MIME_TEXT_ONLY_MP_MIXED 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_5000_5999 0, BODY_SIZE_7000_LESS 0, NO_REAL_NAME 0, __BAT_BOUNDARY 0, __BOUNCE_CHALLENGE_SUBJ 0, __BOUNCE_NDR_SUBJ_EXEMPT 0, __CT 0, __CTYPE_HAS_BOUNDARY 0, __CTYPE_MULTIPART 0, __CTYPE_MULTIPART_MIXED 0, __HAS_MSGID 0, __MIME_TEXT_ONLY 0, __MIME_VERSION 0, __MOZILLA_MSGID 0, __SANE_MSGID 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_PATH 0, __URI_NO_WWW 0, __USER_AGENT 0' X-LSpam-Score: -3.3 (---) X-LSpam-Report: No, score=-3.3 required=5.0 tests=AWL=0.250, BAYES_00=-2.599, RCVD_IN_DNSWL_LOW=-1 autolearn=ham Subject: Re: [vdr] [patch] pin & epgsearch plugins compatibility X-BeenThere: vdr@linuxtv.org X-Mailman-Version: 2.1.11 Precedence: list Reply-To: VDR Mailing List List-Id: VDR Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Jan 2011 00:13:27 -0000 Status: O X-Status: X-Keywords: X-UID: 24142 Opps! My patch was wrong, here is fixed version Jiri Dne 8.1.2011 23:31, jdobry@centrum.cz napsal(a): > Hello all, > > I found that pin & epgsearch plugins are not compatible if it is > compiled on 1.7.16 (maybe more versions). > > Patch for epgsearch-0.9.25.beta18 is in attachment > > Jiri Dobry > diff -rupN epgsearch-0.9.25.beta18/menu_commands.c epgsearch-0.9.25.beta18-1/menu_commands.c --- epgsearch-0.9.25.beta18/menu_commands.c 2010-09-19 20:01:58.000000000 +0200 +++ epgsearch-0.9.25.beta18-1/menu_commands.c 2011-01-08 22:42:28.000000000 +0100 @@ -165,7 +165,7 @@ eOSState cMenuSearchCommands::Record(voi } #ifdef USE_PINPLUGIN aux = ""; - aux = UpdateAuxValue(aux, "protected", timer->FskProtection() ? "yes" : "no"); + aux = UpdateAuxValue(aux, "protected", timer->HasFlags(tfProtected) ? "yes" : "no"); fullaux = UpdateAuxValue(fullaux, "pin-plugin", aux); #endif diff -rupN epgsearch-0.9.25.beta18/menu_main.c epgsearch-0.9.25.beta18-1/menu_main.c --- epgsearch-0.9.25.beta18/menu_main.c 2010-09-19 20:01:58.000000000 +0200 +++ epgsearch-0.9.25.beta18-1/menu_main.c 2011-01-08 22:42:46.000000000 +0100 @@ -226,7 +226,7 @@ eOSState cMenuSearchMain::Record(void) } #ifdef USE_PINPLUGIN aux = ""; - aux = UpdateAuxValue(aux, "protected", timer->FskProtection() ? "yes" : "no"); + aux = UpdateAuxValue(aux, "protected", timer->HasFlags(tfProtected) ? "yes" : "no"); fullaux = UpdateAuxValue(fullaux, "pin-plugin", aux); #endif diff -rupN epgsearch-0.9.25.beta18/menu_myedittimer.c epgsearch-0.9.25.beta18-1/menu_myedittimer.c --- epgsearch-0.9.25.beta18/menu_myedittimer.c 2010-09-19 20:01:57.000000000 +0200 +++ epgsearch-0.9.25.beta18-1/menu_myedittimer.c 2011-01-09 00:51:27.000000000 +0100 @@ -34,6 +34,10 @@ The project's page is at http://winni.vd #include "menu_deftimercheckmethod.h" #include "timerstatus.h" #include +#ifdef USE_PINPLUGIN +#include +using namespace PinPatch; +#endif const char *cMenuMyEditTimer::CheckModes[3]; @@ -63,7 +67,7 @@ cMenuMyEditTimer::cMenuMyEditTimer(cTime strcpy(file, Timer->File()); channel = Timer->Channel()->Number(); #ifdef USE_PINPLUGIN - fskProtection = Timer->FskProtection(); + fskProtection = Timer->HasFlags(tfProtected); #endif if (forcechannel) channel = forcechannel->Number(); @@ -125,7 +129,7 @@ void cMenuMyEditTimer::Set() Add(new cMenuEditStrItem( tr("Directory"), directory, MaxFileName, tr(AllowedChars))); Add(new cMenuEditBitItem( trVDR("Active"), &flags, tfActive)); #ifdef USE_PINPLUGIN - if (cOsd::pinValid) Add(new cMenuEditChanItem(tr("Channel"), &channel)); + if (ChildLock::IsUnlocked()) Add(new cMenuEditChanItem(tr("Channel"), &channel)); else { cString buf = cString::sprintf("%s\t%s", tr("Channel"), Channels.GetByNumber(channel)->Name()); Add(new cOsdItem(buf)); @@ -144,7 +148,7 @@ void cMenuMyEditTimer::Set() Add(new cMenuEditIntItem( trVDR("Priority"), &priority, 0, MAXPRIORITY)); Add(new cMenuEditIntItem( trVDR("Lifetime"), &lifetime, 0, MAXLIFETIME)); #ifdef USE_PINPLUGIN - if (cOsd::pinValid || !fskProtection) Add(new cMenuEditBoolItem(tr("Childlock"),&fskProtection)); + if (ChildLock::IsUnlocked() || !fskProtection) Add(new cMenuEditBoolItem(tr("Childlock"),&fskProtection)); else { cString buf = cString::sprintf("%s\t%s", tr("Childlock"), fskProtection ? trVDR("yes") : trVDR("no")); Add(new cOsdItem(buf)); diff -rupN epgsearch-0.9.25.beta18/menu_searchresults.c epgsearch-0.9.25.beta18-1/menu_searchresults.c --- epgsearch-0.9.25.beta18/menu_searchresults.c 2010-09-19 20:01:56.000000000 +0200 +++ epgsearch-0.9.25.beta18-1/menu_searchresults.c 2011-01-08 22:44:10.000000000 +0100 @@ -259,7 +259,7 @@ eOSState cMenuSearchResults::Record(void #ifdef USE_PINPLUGIN aux = ""; - aux = UpdateAuxValue(aux, "protected", timer->FskProtection() ? "yes" : "no"); + aux = UpdateAuxValue(aux, "protected", timer->HasFlags(tfProtected) ? "yes" : "no"); fullaux = UpdateAuxValue(fullaux, "pin-plugin", aux); #endif diff -rupN epgsearch-0.9.25.beta18/menu_whatson.c epgsearch-0.9.25.beta18-1/menu_whatson.c --- epgsearch-0.9.25.beta18/menu_whatson.c 2010-11-24 19:14:00.000000000 +0100 +++ epgsearch-0.9.25.beta18-1/menu_whatson.c 2011-01-08 22:44:01.000000000 +0100 @@ -580,7 +580,7 @@ eOSState cMenuWhatsOnSearch::Record(void } #ifdef USE_PINPLUGIN aux = ""; - aux = UpdateAuxValue(aux, "protected", timer->FskProtection() ? "yes" : "no"); + aux = UpdateAuxValue(aux, "protected", timer->HasFlags(tfProtected) ? "yes" : "no"); fullaux = UpdateAuxValue(fullaux, "pin-plugin", aux); #endif SetAux(timer, fullaux);