diff options
| author | Dieter Hametner <dh (plus) vdr (at) gekrumbel (dot) de> | 2009-12-08 01:15:18 +0100 |
|---|---|---|
| committer | Dieter Hametner <dh (plus) vdr (at) gekrumbel (dot) de> | 2009-12-08 01:15:18 +0100 |
| commit | 1b5504e1a79dd4560606b96ab8bc7ade5be1c3e5 (patch) | |
| tree | 9db9bc8eb3140957ffd6b732f9217a3eacc6bc5a /pages | |
| parent | 7cd21320ac51afe2bf60ccf6515539351d090c34 (diff) | |
| download | vdr-plugin-live-1b5504e1a79dd4560606b96ab8bc7ade5be1c3e5.tar.gz vdr-plugin-live-1b5504e1a79dd4560606b96ab8bc7ade5be1c3e5.tar.bz2 | |
Made recordings http streaming dependent on tntnet version 1.7.0 and
aboove because that version only supports 'calming down' the request
watchdog. Without that the tntnet request watchdog killed the whole
VDR process after 600 sec. Thus recordings lasting longer than 10
minutes could not be displayed and even worse the whole VDR process
terminated. That could break currently running timers.
Diffstat (limited to 'pages')
| -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) { |