summaryrefslogtreecommitdiff
path: root/server/streamer.c
diff options
context:
space:
mode:
authorschmirl <schmirl>2010-07-19 13:50:11 +0000
committerschmirl <schmirl>2010-07-19 13:50:11 +0000
commitfa578940f7770876d884093a57f657b03213cea3 (patch)
tree6b7d56a314e4ed9b90102a8d53f08e769dc7a1e9 /server/streamer.c
parenta43455f660040140fcfd9401ceb81f1e13f8bd7d (diff)
downloadvdr-plugin-streamdev-fa578940f7770876d884093a57f657b03213cea3.tar.gz
vdr-plugin-streamdev-fa578940f7770876d884093a57f657b03213cea3.tar.bz2
- using SIGINT in externremux to kill mencoder works better than SIGTERM;
especially x264 still needs a SIGKILL sometimes - added --remove-destination to cp commands installing plugins - updated Italian translation (thanks to Diego Pierotto) - config option "client may suspend" hidden if not applicable - updated and enhanced README - added support for HTTP method HEAD - rewrite of externremux.sh, including support for various URL parameters, logging and improved shutdown - start externremux script in a separate process group - changed HTTP URL path for externremux from EXTERN to EXT (suggested by Rolf Ahrenberg) - HTTP headers now have to be emitted by externremux script - pass channel related information and URL parameters to externremux script through environment - implement CGI like interface for externremux script Modified Files: Tag: v0_4 CONTRIBUTORS HISTORY Makefile README common.c common.h i18n.c remux/extern.c remux/extern.h server/connection.c server/connection.h server/connectionHTTP.c server/connectionHTTP.h server/connectionIGMP.c server/connectionVTP.c server/livestreamer.c server/livestreamer.h server/menuHTTP.c server/setup.c server/setup.h server/streamer.c server/streamer.h streamdev/externremux.sh streamdev/streamdevhosts.conf
Diffstat (limited to 'server/streamer.c')
-rw-r--r--server/streamer.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/server/streamer.c b/server/streamer.c
index 97e4ab6..a10c1f4 100644
--- a/server/streamer.c
+++ b/server/streamer.c
@@ -1,5 +1,5 @@
/*
- * $Id: streamer.c,v 1.16.2.3 2009/06/29 06:25:30 schmirl Exp $
+ * $Id: streamer.c,v 1.16.2.4 2010/07/19 13:50:14 schmirl Exp $
*/
#include <vdr/ringbuffer.h>
@@ -100,8 +100,9 @@ void cStreamdevWriter::Action(void)
// --- cStreamdevStreamer -----------------------------------------------------
-cStreamdevStreamer::cStreamdevStreamer(const char *Name):
+cStreamdevStreamer::cStreamdevStreamer(const char *Name, const cServerConnection *Connection):
cThread(Name),
+ m_Connection(Connection),
m_Writer(NULL),
m_RingBuffer(new cStreamdevBuffer(STREAMERBUFSIZE, TS_SIZE * 2,
true, "streamdev-streamer")),