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/streamer.h | |
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/streamer.h')
-rw-r--r-- | server/streamer.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/server/streamer.h b/server/streamer.h index acb5486..ec09b0f 100644 --- a/server/streamer.h +++ b/server/streamer.h @@ -1,5 +1,5 @@ /* - * $Id: streamer.h,v 1.8.2.3 2009/06/29 06:25:30 schmirl Exp $ + * $Id: streamer.h,v 1.8.2.4 2010/07/19 13:50:14 schmirl Exp $ */ #ifndef VDR_STREAMDEV_STREAMER_H @@ -11,6 +11,7 @@ class cTBSocket; class cStreamdevStreamer; +class cServerConnection; #ifndef TS_SIZE #define TS_SIZE 188 @@ -64,6 +65,7 @@ public: class cStreamdevStreamer: public cThread { private: + const cServerConnection *m_Connection; cStreamdevWriter *m_Writer; cStreamdevBuffer *m_RingBuffer; cStreamdevBuffer *m_SendBuffer; @@ -74,9 +76,11 @@ protected: bool IsRunning(void) const { return m_Writer; } public: - cStreamdevStreamer(const char *Name); + cStreamdevStreamer(const char *Name, const cServerConnection *Connection = NULL); virtual ~cStreamdevStreamer(); + const cServerConnection* Connection(void) const { return m_Connection; } + virtual void Start(cTBSocket *Socket); virtual void Stop(void); bool Abort(void); |