diff options
| author | Christian Wieninger <cwieninger@gmx.de> | 2011-03-18 16:10:54 +0100 |
|---|---|---|
| committer | Christian Wieninger <cwieninger@gmx.de> | 2011-03-18 16:10:54 +0100 |
| commit | f5cb8d753eeaceaa0fa27544b349584d3b56e119 (patch) | |
| tree | 660a1735e87e65a1cc382fbf1fa39e5c7090e416 /menu_myedittimer.c | |
| parent | 4f912ae195571726d07f436433648d999be32b78 (diff) | |
| download | vdr-plugin-epgsearch-f5cb8d753eeaceaa0fa27544b349584d3b56e119.tar.gz vdr-plugin-epgsearch-f5cb8d753eeaceaa0fa27544b349584d3b56e119.tar.bz2 | |
reverted previous patch to support again the pin patch as delivered with the current extpatch
Diffstat (limited to 'menu_myedittimer.c')
| -rw-r--r-- | menu_myedittimer.c | 10 |
1 files changed, 3 insertions, 7 deletions
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 <math.h> -#ifdef USE_PINPLUGIN -#include <vdr/childlock.h> -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)); |