From f5cb8d753eeaceaa0fa27544b349584d3b56e119 Mon Sep 17 00:00:00 2001 From: Christian Wieninger Date: Fri, 18 Mar 2011 16:10:54 +0100 Subject: reverted previous patch to support again the pin patch as delivered with the current extpatch --- menu_commands.c | 2 +- menu_main.c | 2 +- menu_myedittimer.c | 10 +++------- menu_searchresults.c | 2 +- menu_whatson.c | 2 +- 5 files changed, 7 insertions(+), 11 deletions(-) diff --git a/menu_commands.c b/menu_commands.c index f7e654c..ab0ef99 100644 --- a/menu_commands.c +++ b/menu_commands.c @@ -165,7 +165,7 @@ eOSState cMenuSearchCommands::Record(void) } #ifdef USE_PINPLUGIN aux = ""; - aux = UpdateAuxValue(aux, "protected", timer->HasFlags(tfProtected) ? "yes" : "no"); + aux = UpdateAuxValue(aux, "protected", timer->FskProtection() ? "yes" : "no"); fullaux = UpdateAuxValue(fullaux, "pin-plugin", aux); #endif diff --git a/menu_main.c b/menu_main.c index cd5c475..4de14a8 100644 --- a/menu_main.c +++ b/menu_main.c @@ -226,7 +226,7 @@ eOSState cMenuSearchMain::Record(void) } #ifdef USE_PINPLUGIN aux = ""; - aux = UpdateAuxValue(aux, "protected", timer->HasFlags(tfProtected) ? "yes" : "no"); + aux = UpdateAuxValue(aux, "protected", timer->FskProtection() ? "yes" : "no"); fullaux = UpdateAuxValue(fullaux, "pin-plugin", aux); #endif diff --git a/menu_myedittimer.c b/menu_myedittimer.c index 85da2dd..b704b06 100644 --- a/menu_myedittimer.c +++ b/menu_myedittimer.c @@ -34,10 +34,6 @@ The project's page is at http://winni.vdr-developer.org/epgsearch #include "menu_deftimercheckmethod.h" #include "timerstatus.h" #include -#ifdef USE_PINPLUGIN -#include -using namespace PinPatch; -#endif const char *cMenuMyEditTimer::CheckModes[3]; @@ -67,7 +63,7 @@ cMenuMyEditTimer::cMenuMyEditTimer(cTimer *Timer, bool New, const cEvent* Event, strcpy(file, Timer->File()); channel = Timer->Channel()->Number(); #ifdef USE_PINPLUGIN - fskProtection = Timer->HasFlags(tfProtected); + fskProtection = Timer->FskProtection(); #endif if (forcechannel) channel = forcechannel->Number(); @@ -129,7 +125,7 @@ void cMenuMyEditTimer::Set() Add(new cMenuEditStrItem( tr("Directory"), directory, MaxFileName, tr(AllowedChars))); Add(new cMenuEditBitItem( trVDR("Active"), &flags, tfActive)); #ifdef USE_PINPLUGIN - if (ChildLock::IsUnlocked()) Add(new cMenuEditChanItem(tr("Channel"), &channel)); + if (cOsd::pinValid) Add(new cMenuEditChanItem(tr("Channel"), &channel)); else { cString buf = cString::sprintf("%s\t%s", tr("Channel"), Channels.GetByNumber(channel)->Name()); Add(new cOsdItem(buf)); @@ -148,7 +144,7 @@ void cMenuMyEditTimer::Set() Add(new cMenuEditIntItem( trVDR("Priority"), &priority, 0, MAXPRIORITY)); Add(new cMenuEditIntItem( trVDR("Lifetime"), &lifetime, 0, MAXLIFETIME)); #ifdef USE_PINPLUGIN - if (ChildLock::IsUnlocked() || !fskProtection) Add(new cMenuEditBoolItem(tr("Childlock"),&fskProtection)); + if (cOsd::pinValid || !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 --git a/menu_searchresults.c b/menu_searchresults.c index 648bf6b..9f3a5c4 100644 --- a/menu_searchresults.c +++ b/menu_searchresults.c @@ -259,7 +259,7 @@ eOSState cMenuSearchResults::Record(void) #ifdef USE_PINPLUGIN aux = ""; - aux = UpdateAuxValue(aux, "protected", timer->HasFlags(tfProtected) ? "yes" : "no"); + aux = UpdateAuxValue(aux, "protected", timer->FskProtection() ? "yes" : "no"); fullaux = UpdateAuxValue(fullaux, "pin-plugin", aux); #endif diff --git a/menu_whatson.c b/menu_whatson.c index 358c29c..aea7fd8 100644 --- a/menu_whatson.c +++ b/menu_whatson.c @@ -580,7 +580,7 @@ eOSState cMenuWhatsOnSearch::Record(void) } #ifdef USE_PINPLUGIN aux = ""; - aux = UpdateAuxValue(aux, "protected", timer->HasFlags(tfProtected) ? "yes" : "no"); + aux = UpdateAuxValue(aux, "protected", timer->FskProtection() ? "yes" : "no"); fullaux = UpdateAuxValue(fullaux, "pin-plugin", aux); #endif SetAux(timer, fullaux); -- cgit v1.2.3