diff options
| author | phintuka <phintuka> | 2009-03-24 19:20:54 +0000 |
|---|---|---|
| committer | phintuka <phintuka> | 2009-03-24 19:20:54 +0000 |
| commit | d9825af55f28dde2a8a97991e555dce86f7f8eab (patch) | |
| tree | 3c9c338d444422b978eae545331ebae7574dd002 | |
| parent | 28bb6fad5f62f9645ecb08cde11b08c25b50e355 (diff) | |
| download | xineliboutput-d9825af55f28dde2a8a97991e555dce86f7f8eab.tar.gz xineliboutput-d9825af55f28dde2a8a97991e555dce86f7f8eab.tar.bz2 | |
Disabled UDP/RTP with vdr-1.7.1 and later
(scheduler is not yet MPEG-TS compatible)
Removed macro that was used only once
| -rw-r--r-- | frontend_svr.c | 29 |
1 files changed, 20 insertions, 9 deletions
diff --git a/frontend_svr.c b/frontend_svr.c index 2f1799d1..b61a983a 100644 --- a/frontend_svr.c +++ b/frontend_svr.c @@ -4,7 +4,7 @@ * See the main source file 'xineliboutput.c' for copyright information and * how to reach the author. * - * $Id: frontend_svr.c,v 1.71 2009-03-24 19:07:31 phintuka Exp $ + * $Id: frontend_svr.c,v 1.72 2009-03-24 19:20:54 phintuka Exp $ * */ @@ -940,11 +940,6 @@ uchar *cXinelibServer::GrabImage(int &Size, bool Jpeg, // (Client) Control message handling // -#define CREATE_NEW_WRITER \ - if(m_Writer[cli]) \ - delete m_Writer[cli]; \ - m_Writer[cli] = new cTcpWriter(fd); - void cXinelibServer::Handle_Control_PIPE(int cli, const char *arg) { LOGDBG("Trying PIPE connection ..."); @@ -1003,7 +998,9 @@ void cXinelibServer::Handle_Control_PIPE(int cli, const char *arg) RemoveFileOrDir(m_PipesDir, false); fd_control[cli].write_cmd("PIPE OK\r\n"); - CREATE_NEW_WRITER; + if (m_Writer[cli]) + delete m_Writer[cli]; + m_Writer[cli] = new cTcpWriter(fd); if (m_Header) m_Writer[cli]->Put(0, m_Header, m_HeaderLength); @@ -1074,9 +1071,9 @@ void cXinelibServer::Handle_Control_DATA(int cli, const char *arg) cli = clientId; - if(m_Writer[cli]) + if (m_Writer[cli]) delete m_Writer[cli]; - m_Writer[cli] = new cTcpWriter(fd_data[cli]); + m_Writer[cli] = new cTcpWriter(fd_data[cli]); if (m_Header) m_Writer[cli]->Put(0, m_Header, m_HeaderLength); @@ -1091,6 +1088,13 @@ void cXinelibServer::Handle_Control_RTP(int cli, const char *arg) CloseDataConnection(cli); +#if VDRVERSNUM > 10700 + // UDP/RTP not MPEG-TS compatible yet + fd_control[cli].write_cmd("RTP: RTP transport not implemented for vdr-1.7.x.\r\n"); + LOGMSG("RTP transport not implemented for vdr-1.7.x"); + return; +#endif + if(!xc.remote_usertp) { fd_control[cli].write_cmd("RTP: RTP transport disabled in configuration.\r\n"); LOGMSG("RTP transports disabled"); @@ -1112,6 +1116,13 @@ void cXinelibServer::Handle_Control_UDP(int cli, const char *arg) CloseDataConnection(cli); +#if VDRVERSNUM > 10700 + // UDP/RTP not MPEG-TS compatible yet + fd_control[cli].write_cmd("UDP: UDP transport not implemented vor vdr-1.7.x.\r\n"); + LOGMSG("UDP transport not implemented for vdr-1.7.x"); + return; +#endif + if(!xc.remote_useudp) { fd_control[cli].write_cmd("UDP: UDP transport disabled in configuration.\r\n"); LOGMSG("UDP transport disabled in configuration"); |