diff options
| -rw-r--r-- | pages/Makefile | 3 | ||||
| -rw-r--r-- | pages/pageelems.ecpp | 9 | ||||
| -rw-r--r-- | pages/recstream.ecpp | 3 |
3 files changed, 13 insertions, 2 deletions
diff --git a/pages/Makefile b/pages/Makefile index c49c673..2ab3960 100644 --- a/pages/Makefile +++ b/pages/Makefile @@ -29,8 +29,9 @@ all: libpages.a ### tntnet produces some compiler warnings, ### so we add -Wno-unused-variable -Wno-non-virtual-dtor for nice output ;) +# $(CXX) $(CXXFLAGS) -Wno-unused-variable -Wno-non-virtual-dtor -c $(DEFINES) $(INCLUDES) $< %.o: %.cpp - $(CXX) $(CXXFLAGS) -Wno-unused-variable -Wno-non-virtual-dtor -c $(DEFINES) $(INCLUDES) $< + $(CXX) $(CXXFLAGS) -Wno-unused-variable -c $(DEFINES) $(INCLUDES) $< %.cpp: %.ecpp $(ECPPC) $(ECPPFLAGS) $(ECPPFLAGS_CPP) $< diff --git a/pages/pageelems.ecpp b/pages/pageelems.ecpp index 4ced607..58a1746 100644 --- a/pages/pageelems.ecpp +++ b/pages/pageelems.ecpp @@ -123,7 +123,14 @@ int update_status(1); string recid; string linkText; </%args> -<%cpp> { </%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> } </%cpp> +<%cpp> +#if TNTVERSION >= 1700 +{ +</%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> +} +#endif +</%cpp> </%def> diff --git a/pages/recstream.ecpp b/pages/recstream.ecpp index d8fb3a9..552fb87 100644 --- a/pages/recstream.ecpp +++ b/pages/recstream.ecpp @@ -58,6 +58,9 @@ if (recording) { if (!reply.out()) { return HTTP_GONE; } +#if TNTVERSION >= 1700 + request.touch(); // retrigger the watchdog. +#endif } // dsyslog("LIVE: bytesRead = %zd", bytesRead); if (bytesRead < 0) { |