summaryrefslogtreecommitdiff
path: root/server/livestreamer.h
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/livestreamer.h
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/livestreamer.h')
-rw-r--r--server/livestreamer.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/server/livestreamer.h b/server/livestreamer.h
index 92448bb..283a395 100644
--- a/server/livestreamer.h
+++ b/server/livestreamer.h
@@ -18,7 +18,6 @@ class cStreamdevLiveReceiver;
class cStreamdevLiveStreamer: public cStreamdevStreamer {
private:
int m_Priority;
- std::string m_Parameter;
int m_Pids[MAXRECEIVEPIDS + 1];
int m_NumPids;
eStreamType m_StreamType;
@@ -32,13 +31,13 @@ private:
bool HasPid(int Pid);
public:
- cStreamdevLiveStreamer(int Priority, std::string Parameter = "");
+ cStreamdevLiveStreamer(int Priority, const cServerConnection *Connection);
virtual ~cStreamdevLiveStreamer();
void SetDevice(cDevice *Device) { m_Device = Device; }
bool SetPid(int Pid, bool On);
bool SetPids(int Pid, const int *Pids1 = NULL, const int *Pids2 = NULL, const int *Pids3 = NULL);
- bool SetChannel(const cChannel *Channel, eStreamType StreamType, int Apid = 0);
+ bool SetChannel(const cChannel *Channel, eStreamType StreamType, const int* Apid = NULL, const int* Dpid = NULL);
virtual int Put(const uchar *Data, int Count);
virtual uchar *Get(int &Count);