diff options
| author | Frank Schmirler <vdr@schmirler.de> | 2010-12-02 09:02:31 +0100 |
|---|---|---|
| committer | Frank Schmirler <vdr@schmirler.de> | 2010-12-02 09:04:50 +0100 |
| commit | 31df0eaf8e49bc1cfea755bd88f3dd795c8f1ace (patch) | |
| tree | edc73b2c6e6af1c2b5d19521fae3a5347dad659d /client | |
| parent | 7576173547027dae57206cfd3d967d5c516fa6b7 (diff) | |
| download | vdr-plugin-streamdev-31df0eaf8e49bc1cfea755bd88f3dd795c8f1ace.tar.gz vdr-plugin-streamdev-31df0eaf8e49bc1cfea755bd88f3dd795c8f1ace.tar.bz2 | |
Streamdev 0.3.4
Diffstat (limited to 'client')
| -rw-r--r-- | client/device.c | 10 | ||||
| -rw-r--r-- | client/socket.c | 12 |
2 files changed, 18 insertions, 4 deletions
diff --git a/client/device.c b/client/device.c index 7069c62..da93d12 100644 --- a/client/device.c +++ b/client/device.c @@ -1,5 +1,5 @@ /* - * $Id: device.c,v 1.14 2007/07/20 06:46:47 schmirl Exp $ + * $Id: device.c,v 1.15 2007/12/12 12:22:45 schmirl Exp $ */ #include "client/device.h" @@ -212,8 +212,16 @@ void cStreamdevDevice::CloseDvrInt(void) { } Dprintf("cStreamdevDevice::CloseDvrInt(): Closing DVR connection\n"); +#if VDRVERSNUM < 10500 DELETENULL(m_TSBuffer); ClientSocket.CloseDvr(); +#else + // Hack for VDR 1.5.x clients (sometimes sending ABRT after TUNE) + // TODO: Find a clean solution to fix this + ClientSocket.SetChannelDevice(m_Channel); + ClientSocket.CloseDvr(); + DELETENULL(m_TSBuffer); +#endif } void cStreamdevDevice::CloseDvr(void) { diff --git a/client/socket.c b/client/socket.c index 5db6efe..f349e71 100644 --- a/client/socket.c +++ b/client/socket.c @@ -1,5 +1,5 @@ /* - * $Id: socket.c,v 1.8 2007/04/24 10:57:34 schmirl Exp $ + * $Id: socket.c,v 1.9 2008/03/13 16:01:17 schmirl Exp $ */ #include <tools/select.h> @@ -140,8 +140,14 @@ bool cClientSocket::CheckConnection(void) { return false; } - isyslog("Streamdev: Connected to server %s:%d using capabilities TSPIDS", - RemoteIp().c_str(), RemotePort()); + const char *Filters = ""; +#if VDRVERSNUM >= 10300 + if(Command("CAPS FILTERS", 220)) + Filters = ",FILTERS"; +#endif + + isyslog("Streamdev: Connected to server %s:%d using capabilities TSPIDS%s", + RemoteIp().c_str(), RemotePort(), Filters); return true; } |