diff options
| author | Dieter Hametner <dh (plus) vdr (at) gekrumbel (dot) de> | 2015-02-10 23:55:25 +0100 |
|---|---|---|
| committer | Dieter Hametner <dh (plus) vdr (at) gekrumbel (dot) de> | 2015-02-10 23:55:25 +0100 |
| commit | e6e5705567a73ac90b040578670d82998cc8788d (patch) | |
| tree | e3139734c1d1090691c44082553e96cc5c267568 /pages | |
| parent | 948c21d5907c78adf00b382d4dc7010b1db5346b (diff) | |
| download | vdr-plugin-live-e6e5705567a73ac90b040578670d82998cc8788d.tar.gz vdr-plugin-live-e6e5705567a73ac90b040578670d82998cc8788d.tar.bz2 | |
Drop support for old tntnet versions: Removed support to read a tntnet config file.
Only code internal configuration is used now.
Diffstat (limited to 'pages')
| -rw-r--r-- | pages/Makefile | 3 | ||||
| -rw-r--r-- | pages/page_exit.eh | 4 |
2 files changed, 0 insertions, 7 deletions
diff --git a/pages/Makefile b/pages/Makefile index 520b208..07fd031 100644 --- a/pages/Makefile +++ b/pages/Makefile @@ -3,9 +3,6 @@ PLUGIN = live ### Additional options to silence TNTNET warnings TNTFLAGS ?= -Wno-overloaded-virtual -Wno-unused-variable -TNTVERSION ?= $(shell tntnet-config --version | sed -e's/\.//g' | sed -e's/pre.*//g' | awk '/^..$$/ { print $$1."000"} /^...$$/ { print $$1."00"} /^....$$/ { print $$1."0" } /^.....$$/ { print $$1 }') -CXXTOOLVER ?= $(shell cxxtools-config --version | sed -e's/\.//g' | sed -e's/pre.*//g' | awk '/^..$$/ { print $$1."000"} /^...$$/ { print $$1."00"} /^....$$/ { print $$1."0" } /^.....$$/ { print $$1 }') - ### Includes and Defines (add further entries here): INCLUDES += -I$(VDRDIR)/include -I.. diff --git a/pages/page_exit.eh b/pages/page_exit.eh index 5101171..319260e 100644 --- a/pages/page_exit.eh +++ b/pages/page_exit.eh @@ -5,11 +5,7 @@ <%cpp> spoint.commit(); } catch ( vdrlive::HtmlError const& ex ) { -#if TNTVERSION >= 1606 tnt::QueryParams param = qparam; -#else - cxxtools::QueryParams param = qparam; -#endif param.add( "pageTitle", pageTitle ); param.add( "errorMessage", ex.what() ); callComp( "error", request, reply, param ); |