diff options
author | schmirl <schmirl> | 2010-07-19 13:50:11 +0000 |
---|---|---|
committer | schmirl <schmirl> | 2010-07-19 13:50:11 +0000 |
commit | fa578940f7770876d884093a57f657b03213cea3 (patch) | |
tree | 6b7d56a314e4ed9b90102a8d53f08e769dc7a1e9 /server/connectionVTP.c | |
parent | a43455f660040140fcfd9401ceb81f1e13f8bd7d (diff) | |
download | vdr-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/connectionVTP.c')
-rw-r--r-- | server/connectionVTP.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/server/connectionVTP.c b/server/connectionVTP.c index 804c6f4..91d9265 100644 --- a/server/connectionVTP.c +++ b/server/connectionVTP.c @@ -1,5 +1,5 @@ /* - * $Id: connectionVTP.c,v 1.18.2.6 2010/01/29 12:02:44 schmirl Exp $ + * $Id: connectionVTP.c,v 1.18.2.7 2010/07/19 13:50:14 schmirl Exp $ */ #include "server/connectionVTP.h" @@ -861,8 +861,8 @@ bool cConnectionVTP::CmdCAPS(char *Opts) return Respond(220, "Capability \"%s\" accepted", Opts); } - if (strcasecmp(Opts, "EXTERN") == 0) { - m_StreamType = stExtern; + if (strcasecmp(Opts, "EXT") == 0) { + m_StreamType = stEXT; return Respond(220, "Capability \"%s\" accepted", Opts); } @@ -1058,7 +1058,7 @@ bool cConnectionVTP::CmdTUNE(char *Opts) return Respond(560, "Channel not available"); delete m_LiveStreamer; - m_LiveStreamer = new cStreamdevLiveStreamer(1); + m_LiveStreamer = new cStreamdevLiveStreamer(1, this); m_LiveStreamer->SetChannel(chan, m_StreamType); m_LiveStreamer->SetDevice(dev); if(m_LiveSocket) |