summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhorchi <vdr@jwendel.de>2017-05-22 16:03:43 (GMT)
committerhorchi <vdr@jwendel.de>2017-05-22 16:03:43 (GMT)
commit95d89c9f9a5dcfcaae93427b937c686ed20d63ba (patch)
treed0e44469536b2c2ccf0fad620b21eb3264655cc0
parent75ef0d7634d209a9713af62403bb08915f26fa4b (diff)
downloadvdr-plugin-epg2vdr-95d89c9f9a5dcfcaae93427b937c686ed20d63ba.tar.gz
vdr-plugin-epg2vdr-95d89c9f9a5dcfcaae93427b937c686ed20d63ba.tar.bz2
2017-05-22 version 1.1.61 (horchi)\n - bugfix: Fixed aux handling\n\n1.1.61
-rw-r--r--HISTORY.h7
-rw-r--r--Make.config4
-rw-r--r--epg2vdr.c2
-rw-r--r--handler.h6
-rw-r--r--update.c2
5 files changed, 12 insertions, 9 deletions
diff --git a/HISTORY.h b/HISTORY.h
index dd71073..a9e495e 100644
--- a/HISTORY.h
+++ b/HISTORY.h
@@ -5,8 +5,8 @@
*
*/
-#define _VERSION "1.1.60"
-#define VERSION_DATE "07.05.2017"
+#define _VERSION "1.1.61"
+#define VERSION_DATE "22.05.2017"
#define DB_API 4
@@ -19,6 +19,9 @@
/*
* ------------------------------------
+2017-05-22 version 1.1.61 (horchi)
+ - bugfix: Fixed aux handling
+
2017-05-07 version 1.1.60 (horchi)
- bugfix: Fixed possible crash on channel lock
diff --git a/Make.config b/Make.config
index 7f80a5d..5cc25da 100644
--- a/Make.config
+++ b/Make.config
@@ -9,8 +9,8 @@
PREFIX = /usr/local
-# enable AUX patch, in VDR >= 2.3.3 not needed!
-#WITH_AUX_PATCH = 1
+# enable AUX patch, in VDR >= 2.3.4 not needed!
+WITH_AUX_PATCH = 1
# enable graphtftng and/or pin plugin support if autodetection below don't work
#WITH_GTFT = 1
diff --git a/epg2vdr.c b/epg2vdr.c
index a3c299f..de2d621 100644
--- a/epg2vdr.c
+++ b/epg2vdr.c
@@ -372,6 +372,7 @@ void cMenuSetupEPG2VDR::Store()
SetupStore("UseCommonRecFolder", Epg2VdrConfig.useCommonRecFolder);
SetupStore("ReplaceScheduleMenu", Epg2VdrConfig.replaceScheduleMenu);
SetupStore("ReplaceTimerMenu", Epg2VdrConfig.replaceTimerMenu);
+ SetupStore("ExtendedEpgData2Aux", Epg2VdrConfig.extendedEpgData2Aux);
if (userCount && Epg2VdrConfig.userIndex >= 0)
{
@@ -1016,6 +1017,7 @@ bool cPluginEPG2VDR::SetupParse(const char *Name, const char *Value)
else if (!strcasecmp(Name, "ReplaceScheduleMenu")) Epg2VdrConfig.replaceScheduleMenu = atoi(Value);
else if (!strcasecmp(Name, "ReplaceTimerMenu")) Epg2VdrConfig.replaceTimerMenu = atoi(Value);
else if (!strcasecmp(Name, "User")) sstrcpy(Epg2VdrConfig.user, Value, sizeof(Epg2VdrConfig.user));
+ else if (!strcasecmp(Name, "ExtendedEpgData2Aux")) Epg2VdrConfig.extendedEpgData2Aux = atoi(Value);
else
return false;
diff --git a/handler.h b/handler.h
index 43e9d14..53b7211 100644
--- a/handler.h
+++ b/handler.h
@@ -399,7 +399,7 @@ class cEpgHandlerInstance
channelId = Channel->GetChannelID();
- return false;
+ return true;
}
//***************************************************************************
@@ -970,9 +970,7 @@ class cEpg2VdrEpgHandler : public cEpgHandler
if (!handlerMutex.tryLock())
return false;
- getHandler()->BeginSegmentTransfer(Channel, dummy);
-
- return true;
+ return getHandler()->BeginSegmentTransfer(Channel, dummy);
}
virtual bool EndSegmentTransfer(bool Modified, bool dummy)
diff --git a/update.c b/update.c
index c11fc0d..8c12930 100644
--- a/update.c
+++ b/update.c
@@ -1684,7 +1684,7 @@ cEvent* cUpdate::createEventFromRow(const cDbRow* row)
delete components;
}
-#if (defined (APIVERSNUM) && (APIVERSNUM >= 20303)) || (WITH_AUX_PATCH)
+#if (defined (APIVERSNUM) && (APIVERSNUM >= 20304)) || (WITH_AUX_PATCH)
// ------------
// aux