summaryrefslogtreecommitdiff
path: root/pages
diff options
context:
space:
mode:
Diffstat (limited to 'pages')
-rw-r--r--pages/pageelems.ecpp3
-rw-r--r--pages/recordings.ecpp2
-rw-r--r--pages/recstream.ecpp3
-rw-r--r--pages/vlc.ecpp3
4 files changed, 7 insertions, 4 deletions
diff --git a/pages/pageelems.ecpp b/pages/pageelems.ecpp
index 58a1746..87ca604 100644
--- a/pages/pageelems.ecpp
+++ b/pages/pageelems.ecpp
@@ -4,6 +4,7 @@
#include <vdr/epg.h>
#include "exception.h"
#include "livefeatures.h"
+#include "tntfeatures.h"
#include "i18n.h"
#include "setup.h"
#include "timers.h"
@@ -124,7 +125,7 @@ int update_status(1);
string linkText;
</%args>
<%cpp>
-#if TNTVERSION >= 1700
+#if TNT_WATCHDOG_SILENCE
{
</%cpp><a href="vlc.html?recid=<$ recid $>"><img src="<$ LiveSetup().GetThemedLink("img", "stream_button.png") $>" alt="" <& tooltip.hint text=(tr("Stream this recording into browser.")) &>></img> <$ linkText $></a>
<%cpp>
diff --git a/pages/recordings.ecpp b/pages/recordings.ecpp
index 7b57c11..76bbe65 100644
--- a/pages/recordings.ecpp
+++ b/pages/recordings.ecpp
@@ -116,7 +116,7 @@ for (iter = recordingsTree->begin(path); iter != end; ++iter) {
<li class="recording">
<& rec_item_dir name=(recItem->Name()) level=(level) &>
<%cpp>
-#if TNTVERSION >= 1606
+#if TNT_HAS_QUERYPARAMS
tnt::QueryParams recItemParams(qparam, false);
#else
cxxtools::QueryParams recItemParams(qparam, false);
diff --git a/pages/recstream.ecpp b/pages/recstream.ecpp
index 552fb87..015206e 100644
--- a/pages/recstream.ecpp
+++ b/pages/recstream.ecpp
@@ -6,6 +6,7 @@
#include <tnt/httperror.h>
#include <tnt/httpheader.h>
#include <vdr/recording.h>
+#include "tntfeatures.h"
#include "setup.h"
#include "recman.h"
@@ -58,7 +59,7 @@ if (recording) {
if (!reply.out()) {
return HTTP_GONE;
}
-#if TNTVERSION >= 1700
+#if TNT_WATCHDOG_SILENCE
request.touch(); // retrigger the watchdog.
#endif
}
diff --git a/pages/vlc.ecpp b/pages/vlc.ecpp
index 065969c..d1f1405 100644
--- a/pages/vlc.ecpp
+++ b/pages/vlc.ecpp
@@ -5,6 +5,7 @@
#include "setup.h"
#include "tools.h"
#include "users.h"
+#include "tntfeatures.h"
using namespace std;
using namespace vdrlive;
@@ -97,7 +98,7 @@ using namespace vdrlive;
}
</%cpp>
<%cpp>
-#if TNTVERSION >= 1606
+#if TNT_HAS_GETHOST
string server = request.getHost();
server = server.substr(0, server.rfind(':'));
#else