From fa578940f7770876d884093a57f657b03213cea3 Mon Sep 17 00:00:00 2001 From: schmirl Date: Mon, 19 Jul 2010 13:50:11 +0000 Subject: - 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 --- server/menuHTTP.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'server/menuHTTP.c') diff --git a/server/menuHTTP.c b/server/menuHTTP.c index 7277473..47df3a8 100644 --- a/server/menuHTTP.c +++ b/server/menuHTTP.c @@ -205,8 +205,8 @@ std::string cHtmlChannelList::StreamTypeMenu() (std::string) "[PES] "); typeMenu += (streamType == stES ? (std::string) "[ES] " : (std::string) "[ES] "); - typeMenu += (streamType == stExtern ? (std::string) "[Extern] " : - (std::string) "[Extern] "); + typeMenu += (streamType == stEXT ? (std::string) "[EXT] " : + (std::string) "[EXT] "); return typeMenu; } -- cgit v1.2.3