diff options
| author | Frank Schmirler <vdr@schmirler.de> | 2010-12-02 09:43:13 +0100 |
|---|---|---|
| committer | Frank Schmirler <vdr@schmirler.de> | 2010-12-02 09:43:13 +0100 |
| commit | 7254a6752808830d5fc133e5362da6c47f3f84ff (patch) | |
| tree | 673cc17f88ba80f8a67debb54f85ea100cde9ae5 /server/connection.c | |
| parent | 31df0eaf8e49bc1cfea755bd88f3dd795c8f1ace (diff) | |
| download | vdr-plugin-streamdev-7254a6752808830d5fc133e5362da6c47f3f84ff.tar.gz vdr-plugin-streamdev-7254a6752808830d5fc133e5362da6c47f3f84ff.tar.bz2 | |
Snapshot 2009-06-11
Diffstat (limited to 'server/connection.c')
| -rw-r--r-- | server/connection.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/server/connection.c b/server/connection.c index 629ed1d..74b2783 100644 --- a/server/connection.c +++ b/server/connection.c @@ -1,5 +1,5 @@ /* - * $Id: connection.c,v 1.10 2007/05/07 12:25:11 schmirl Exp $ + * $Id: connection.c,v 1.12 2009/02/13 10:39:22 schmirl Exp $ */ #include "server/connection.h" @@ -12,7 +12,8 @@ #include <stdarg.h> #include <errno.h> -cServerConnection::cServerConnection(const char *Protocol): +cServerConnection::cServerConnection(const char *Protocol, int Type): + cTBSocket(Type), m_Protocol(Protocol), m_DeferClose(false), m_Pending(false), @@ -139,11 +140,7 @@ cDevice *cServerConnection::GetDevice(const cChannel *Channel, int Priority) Dprintf(" * GetDevice(const cChannel*, int)\n"); Dprintf(" * -------------------------------\n"); -#if VDRVERSNUM < 10500 - device = cDevice::GetDevice(Channel, Priority); -#else device = cDevice::GetDevice(Channel, Priority, false); -#endif Dprintf(" * Found following device: %p (%d)\n", device, device ? device->CardIndex() + 1 : 0); @@ -161,11 +158,7 @@ cDevice *cServerConnection::GetDevice(const cChannel *Channel, int Priority) const cChannel *current = Channels.GetByNumber(cDevice::CurrentChannel()); isyslog("streamdev-server: Detaching current receiver"); Detach(); -#if VDRVERSNUM < 10500 - device = cDevice::GetDevice(Channel, Priority); -#else device = cDevice::GetDevice(Channel, Priority, false); -#endif Attach(); Dprintf(" * Found following device: %p (%d)\n", device, device ? device->CardIndex() + 1 : 0); |