diff options
| -rw-r--r-- | HISTORY.h | 7 | ||||
| -rw-r--r-- | Make.config | 14 | ||||
| -rw-r--r-- | Makefile | 10 | ||||
| -rw-r--r-- | lib/Makefile | 12 | ||||
| -rw-r--r-- | lib/db.c | 8 | ||||
| -rw-r--r-- | menurec.c | 2 | ||||
| -rw-r--r-- | service.h | 1 | ||||
| -rw-r--r-- | update.c | 19 |
8 files changed, 52 insertions, 21 deletions
@@ -5,8 +5,8 @@ * */ -#define _VERSION "1.1.101" -#define VERSION_DATE "30.10.2019" +#define _VERSION "1.1.102" +#define VERSION_DATE "23.12.2019" #define DB_API 7 @@ -19,6 +19,9 @@ /* * ------------------------------------ +2019-12-17: version 1.1.102 (horchi) + - added: Ported changes of master branch + 2019-10-30 version 1.1.101 (horchi) - change: Added evaluation of PKG_CONFIG_PATH environment variable (thaks to kfb77@vdr-portal) diff --git a/Make.config b/Make.config index 85024f4..b60af0f 100644 --- a/Make.config +++ b/Make.config @@ -19,6 +19,9 @@ PREFIX = /usr/local DEBUG = 1 #USE_CLANG = 1 +# set python interpreter +PYTHON ?= python + # ----------------------- # don't touch below ;) @@ -35,6 +38,17 @@ doLib = ar -rs USEPYTHON = 1 USEEPGS = 1 +ifdef USEPYTHON + ifeq ($(shell $(PYTHON) -c 'from __future__ import print_function; import sys; sys.exit(0) if sys.version_info[:2] < (3,8) else print(1)'), 1) + PYTHON_LIBS = $(shell $(PYTHON)-config --libs --embed) + else + PYTHON_LIBS = $(shell $(PYTHON)-config --libs) + endif + LIBS += $(PYTHON_LIBS) + BASELIBS += $(PYTHON_LIBS) + CXXFLAGS += $(shell $(PYTHON)-config --includes) +endif + USES = -DVDR_PLUGIN -DUSEUUID -DUSEMD5 -DUSEJSON -DUSEGUNZIP -DPLUGIN_NAME_I18N='"$(PLUGIN)"' ifdef DEBUG @@ -66,11 +66,17 @@ OBJS = $(PLUGIN).o \ status.o ttools.o svdrpclient.o \ menu.o menusched.o menutimers.o menudone.o menusearchtimer.o menurec.o -LIBS = $(HLIB) +LIBS += $(HLIB) LIBS += -lrt -larchive -lcrypto LIBS += $(shell pkg-config --libs uuid) LIBS += $(shell pkg-config --libs tinyxml2) -LIBS += $(shell mysql_config --libs_r) $(shell python-config --libs) $(shell pkg-config --libs jansson) +LIBS += $(shell mysql_config --libs_r) + +ifdef USEPYTHON + CFLAGS += $(shell $(PYTHON)-config --includes) + LIBS += $(PYTHON_LIBS) +endif +LIBS += $(shell pkg-config --libs jansson) EPG2VDR_DATA_DIR = "/var/cache/vdr" diff --git a/lib/Makefile b/lib/Makefile index 07c3e36..6c00449 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -25,10 +25,11 @@ endif CFLAGS += $(shell pkg-config --cflags uuid) CFLAGS += $(shell pkg-config --cflags zlib) -BASELIBS = -lrt +BASELIBS += -lrt BASELIBS += $(shell mysql_config --libs_r) BASELIBS += $(shell pkg-config --libs uuid) BASELIBS += $(shell pkg-config --libs zlib) +BASELIBS += $(PYTHON_LIBS) BASELIBS += $(shell pkg-config --libs tinyxml2) ifdef USECURL @@ -36,11 +37,10 @@ ifdef USECURL endif ifdef USEEPGS - LIBOBJS += searchtimer.o + LIBOBJS += searchtimer.o endif ifdef USEPYTHON - BASELIBS += $(shell python-config --libs) LIBOBJS += python.o endif @@ -50,16 +50,12 @@ endif ifdef SYSD_NOTIFY BASELIBS += $(shell pkg-config --libs libsystemd-daemon) - CFLAGS += $(shell pkg-config --cflags libsystemd-daemon) + CFLAGS += $(shell pkg-config --cflags libsystemd-daemon) endif CFLAGS += $(shell mysql_config --include) DEFINES += $(USES) -ifdef USEPYTHON - CFLAGS += $(shell python-config --includes) -endif - all: lib $(TEST) $(DEMO) lib: $(LIBTARGET).a @@ -1379,11 +1379,19 @@ int cDbConnection::errorSql(cDbConnection* connection, const char* prefix, if (error == CR_SERVER_LOST || error == CR_SERVER_GONE_ERROR || +// for compatibility with newer versions of MariaDB library +#ifdef CR_INVALID_CONN_HANDLE error == CR_INVALID_CONN_HANDLE || +#endif error == CR_COMMANDS_OUT_OF_SYNC || error == CR_SERVER_LOST_EXTENDED || error == CR_STMT_CLOSED || +// for compatibility with newer versions of MariaDB library +#ifdef CR_CONN_UNKNOW_PROTOCOL error == CR_CONN_UNKNOW_PROTOCOL || +#else + error == CR_CONN_UNKNOWN_PROTOCOL || +#endif error == CR_UNSUPPORTED_PARAM_TYPE || error == CR_NO_PREPARE_STMT || error == CR_SERVER_HANDSHAKE_ERR || @@ -6,7 +6,7 @@ */ /* - Inbetribnahme: + Inbetriebnahme: truncate recordinglist; commit; #> systemctrl start vdr #> svdrpsend PLUG epg2vdr UPDREC @@ -13,6 +13,7 @@ #include <list> #include <map> +#include <string> //*************************************************************************** // Timer - Skin Interface @@ -1361,6 +1361,17 @@ void cUpdate::Action() isHandlerMaster(); + if (Epg2VdrConfig.shareInWeb) + { + // update timer - even when epgd is busy! + + if (dbConnected() && timerTableUpdateTriggered) + updateTimerTable(); + + if (dbConnected()) + hasTimerChanged(); + } + if (epgdBusy) continue; @@ -1374,14 +1385,6 @@ void cUpdate::Action() refreshEpg(0, na); // refresh EPG before performing timer jobs! performTimerJobs(); } - - // update timer - - if (dbConnected() && timerTableUpdateTriggered) - updateTimerTable(); - - if (dbConnected()) - hasTimerChanged(); } // if triggered externally or updates pending |