summaryrefslogtreecommitdiff
path: root/server/connection.c
diff options
context:
space:
mode:
authorFrank Schmirler <vdr@schmirler.de>2011-03-07 21:50:05 +0100
committerroot <root@schleppi.(none)>2011-03-07 22:05:36 +0100
commit79fe54e476fcdb7a770bffe6d4754f246db289d3 (patch)
treef966f67f3c14c78dd68a5ea10c0a1e98e4695840 /server/connection.c
parentd37f1f7d0fafd23f8bb01e9ed439810421aa2f81 (diff)
downloadvdr-plugin-streamdev-79fe54e476fcdb7a770bffe6d4754f246db289d3.tar.gz
vdr-plugin-streamdev-79fe54e476fcdb7a770bffe6d4754f246db289d3.tar.bz2
Dropped compatibility with VDR < 1.5.16
Diffstat (limited to 'server/connection.c')
-rw-r--r--server/connection.c17
1 files changed, 0 insertions, 17 deletions
diff --git a/server/connection.c b/server/connection.c
index 78a023a..2eba103 100644
--- a/server/connection.c
+++ b/server/connection.c
@@ -302,7 +302,6 @@ cDevice *cServerConnection::GetDevice(const cChannel *Channel, int Priority)
&& UsedByLiveTV(device)) {
// now we would have to switch away live tv...let's see if live tv
// can be handled by another device
-#if VDRVERSNUM >= 10516
cDevice::SetAvoidDevice(device);
if (!Channels.SwitchTo(cDevice::CurrentChannel())) {
if (StreamdevServerSetup.SuspendMode == smAlways) {
@@ -314,22 +313,6 @@ cDevice *cServerConnection::GetDevice(const cChannel *Channel, int Priority)
device = NULL;
}
}
-#else
- const cChannel *current = Channels.GetByNumber(cDevice::CurrentChannel());
- cDevice *newdev = current ? CheckDevice(current, 0, true, device) : NULL;
- if (newdev) {
- dsyslog("streamdev: GetDevice: Trying to move live TV to device %d", newdev->CardIndex());
- newdev->SwitchChannel(current, true);
- }
- else if (StreamdevServerSetup.SuspendMode == smAlways) {
- Channels.SwitchTo(Channel->Number());
- Skins.QueueMessage(mtInfo, tr("Streaming active"));
- }
- else {
- dsyslog("streamdev: GetDevice: Live TV not suspended");
- device = NULL;
- }
-#endif
}
if (!device) {