summaryrefslogtreecommitdiff
path: root/epg2vdr.c
diff options
context:
space:
mode:
authorhorchi <vdr@jwendel.de>2017-06-08 23:25:01 +0200
committerhorchi <vdr@jwendel.de>2017-06-08 23:25:01 +0200
commitfa6657c34cd03841b4031307080225ae84ae9adf (patch)
tree05c8d6bfc108841d4a8850e88abe3347ad069808 /epg2vdr.c
parent2a7ae657f85c607a3c916b5d39ae573cd3fd7260 (diff)
downloadvdr-plugin-epg2vdr-fa6657c34cd03841b4031307080225ae84ae9adf.tar.gz
vdr-plugin-epg2vdr-fa6657c34cd03841b4031307080225ae84ae9adf.tar.bz2
2017-06-08 version 1.1.63 (horchi)\n - change: Improved aux field\n - change: Suppress inactive timers on service interface\n\n1.1.63
Diffstat (limited to 'epg2vdr.c')
-rw-r--r--epg2vdr.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/epg2vdr.c b/epg2vdr.c
index a72c019..369da42 100644
--- a/epg2vdr.c
+++ b/epg2vdr.c
@@ -281,7 +281,9 @@ void cMenuSetupEPG2VDR::Setup()
Add(new cMenuEditBoolItem(tr("Prohibit Shutdown On Busy 'epgd'"), &data.activeOnEpgd));
Add(new cMenuEditBoolItem(tr("Schedule Boot For Update"), &data.scheduleBoot));
Add(new cMenuEditBoolItem(tr("Blacklist not configured Channels"), &data.blacklist));
+#if (defined (APIVERSNUM) && (APIVERSNUM >= 20304)) || (WITH_AUX_PATCH)
Add(new cMenuEditBoolItem(tr("Store extended EPD Data to AUX (e.g. for Skins)"), &data.extendedEpgData2Aux));
+#endif
Add(new cOsdItem(cString::sprintf("--------------------- %s ---------------------------------", tr("Menu"))));
cList<cOsdItem>::Last()->SetSelectable(false);
@@ -465,8 +467,9 @@ int cPluginEPG2VDR::initDb()
selectTimers->bind(vdrDb, "UUID", cDBS::bndOut, ", ");
selectTimers->bind(vdrDb, "STATE", cDBS::bndOut, ", ");
selectTimers->clrBindPrefix();
- selectTimers->build(" from %s t, %s v where (t.%s in ('P','R') or t.%s is null)",
+ selectTimers->build(" from %s t, %s v where t.%s and (t.%s in ('P','R') or t.%s is null)",
timerDb->TableName(), vdrDb->TableName(),
+ timerDb->getField("ACTIVE")->getDbName(),
timerDb->getField("STATE")->getDbName(),
timerDb->getField("STATE")->getDbName());
selectTimers->build(" and t.%s = v.%s order by t.%s",