From fa6657c34cd03841b4031307080225ae84ae9adf Mon Sep 17 00:00:00 2001 From: horchi Date: Thu, 8 Jun 2017 23:25:01 +0200 Subject: 2017-06-08 version 1.1.63 (horchi)\n - change: Improved aux field\n - change: Suppress inactive timers on service interface\n\n --- HISTORY.h | 8 ++++++-- epg2vdr.c | 5 ++++- menu.c | 6 +++--- update.c | 1 + 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/HISTORY.h b/HISTORY.h index 91b4360..0423bd3 100644 --- a/HISTORY.h +++ b/HISTORY.h @@ -5,8 +5,8 @@ * */ -#define _VERSION "1.1.62" -#define VERSION_DATE "02.06.2017" +#define _VERSION "1.1.63" +#define VERSION_DATE "08.06.2017" #define DB_API 4 @@ -19,6 +19,10 @@ /* * ------------------------------------ +2017-06-08 version 1.1.63 (horchi) + - change: Improved aux field + - change: Suppress inactive timers on service interface + 2017-06-02 version 1.1.62 (horchi) - change: Minor sorting change 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::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", diff --git a/menu.c b/menu.c index 6f3be32..d24a92a 100644 --- a/menu.c +++ b/menu.c @@ -656,7 +656,7 @@ int cMenuDb::modifyTimer(cDbRow* timerRow, const char* destUuid) { // request 'D'elete of 'old' timer - timerDb->setValue("ACTION", "D"); // = taDelete + timerDb->setCharValue("ACTION", taDelete); timerDb->setValue("SOURCE", Epg2VdrConfig.uuid); timerDb->update(); @@ -665,7 +665,7 @@ int cMenuDb::modifyTimer(cDbRow* timerRow, const char* destUuid) timerDb->copyValues(timerRow, cDBS::ftData); // takeover all data (can be modified by user) timerDb->setValue("ID", 0); // don't care on insert! timerDb->setValue("VDRUUID", destUuid); - timerDb->setValue("ACTION", "C"); // = taCreate + timerDb->setCharValue("ACTION", taCreate); timerDb->setValue("SOURCE", Epg2VdrConfig.uuid); timerDb->insert(); @@ -818,7 +818,7 @@ int cMenuDb::deleteTimer(long timerid) selectTimerById->freeResult(); - timerDb->setValue("ACTION", "D"); // = taDelete + timerDb->setCharValue("ACTION", taDelete); timerDb->setValue("SOURCE", Epg2VdrConfig.uuid); timerDb->update(); diff --git a/update.c b/update.c index 3000677..5437797 100644 --- a/update.c +++ b/update.c @@ -53,6 +53,7 @@ const char* cUpdate::auxFields[] = "other", // text 2000 "shortdescription", // mtext 3000 + "shorttext", // ascii 300 "actor", // mtext 5000 "episodename", // ascii 100 -- cgit v1.2.3