summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Wieninger <cwieninger@gmx.de>2011-01-10 18:42:06 +0100
committerChristian Wieninger <cwieninger@gmx.de>2011-01-10 18:42:06 +0100
commit6f1e31ad8775caf30dacf56a964c5ee7351f7feb (patch)
tree93cfbc21537939deb78fbaeae547e25441ad1bc6
parentfa4fe25d41008f81679917bb77cfdf29a6657d6f (diff)
downloadvdr-plugin-epgsearch-6f1e31ad8775caf30dacf56a964c5ee7351f7feb.tar.gz
vdr-plugin-epgsearch-6f1e31ad8775caf30dacf56a964c5ee7351f7feb.tar.bz2
updated support for pin plugin patch - v2
-rw-r--r--epgsearch.c2
-rw-r--r--menu_myedittimer.c7
2 files changed, 5 insertions, 4 deletions
diff --git a/epgsearch.c b/epgsearch.c
index 8441974..42d686a 100644
--- a/epgsearch.c
+++ b/epgsearch.c
@@ -70,7 +70,7 @@ The project's page is at http://winni.vdr-developer.org/epgsearch
#include "confdloader.h"
#include "pending_notifications.h"
-static const char VERSION[] = "0.9.25.beta19";
+static const char VERSION[] = "0.9.25.beta20";
static const char DESCRIPTION[] = trNOOP("search the EPG for repeats and more");
// globals
diff --git a/menu_myedittimer.c b/menu_myedittimer.c
index a35617a..5683d05 100644
--- a/menu_myedittimer.c
+++ b/menu_myedittimer.c
@@ -35,7 +35,8 @@ The project's page is at http://winni.vdr-developer.org/epgsearch
#include "timerstatus.h"
#include <math.h>
#ifdef USE_PINPLUGIN
-#include "../pin/pin.h"
+#include <vdr/childlock.h>
+using namespace PinPatch;
#endif
const char *cMenuMyEditTimer::CheckModes[3];
@@ -128,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 (PinService::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));
@@ -147,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 (PinService::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));