summaryrefslogtreecommitdiff
path: root/server/connection.c
diff options
context:
space:
mode:
authorschmirl <schmirl>2008-04-08 14:18:15 +0000
committerschmirl <schmirl>2008-04-08 14:18:15 +0000
commit34a62eb2ef9ba0c9e5d269162772c4223bf5fa3b (patch)
tree0cb0bc89b73cbb62cfda77aa5a06f7b80691e9d4 /server/connection.c
parent9c60fb4e42bce2fd3b6d7d9c011f1688cddd4394 (diff)
downloadvdr-plugin-streamdev-34a62eb2ef9ba0c9e5d269162772c4223bf5fa3b.tar.gz
vdr-plugin-streamdev-34a62eb2ef9ba0c9e5d269162772c4223bf5fa3b.tar.bz2
- added gettext support (thanks to Rolf Ahrenberg)
- added vdr-1.6.0-ignore_missing_cam patch - dropped obsolete respect_ca patch - removed legacy code for < VDR 1.5.9 (thanks to Rolf Ahrenberg)
Diffstat (limited to 'server/connection.c')
-rw-r--r--server/connection.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/server/connection.c b/server/connection.c
index 629ed1d..3e00aa7 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.11 2008/04/08 14:18:18 schmirl Exp $
*/
#include "server/connection.h"
@@ -139,11 +139,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 +157,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);