diff options
author | Klaus Schmidinger <vdr@tvdr.de> | 2006-07-22 14:11:02 +0200 |
---|---|---|
committer | Klaus Schmidinger <vdr@tvdr.de> | 2006-07-22 14:11:02 +0200 |
commit | 92e4e131d015e278fbae178126743ccc8b01aaec (patch) | |
tree | 833509bbccff9b44191d7e8f348c68022d3baffe /device.c | |
parent | 375aa2563ad24f127874f45b87a1e70a2fbda50d (diff) | |
download | vdr-92e4e131d015e278fbae178126743ccc8b01aaec.tar.gz vdr-92e4e131d015e278fbae178126743ccc8b01aaec.tar.bz2 |
cDevice::GetDevice() now prefers any device that's already receiving and doesn't require detatching receivers
Diffstat (limited to 'device.c')
-rw-r--r-- | device.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: device.c 1.132 2006/07/22 13:18:34 kls Exp $ + * $Id: device.c 1.133 2006/07/22 14:06:11 kls Exp $ */ #include "device.h" @@ -292,7 +292,7 @@ cDevice *cDevice::GetDevice(const cChannel *Channel, int Priority, bool *NeedsDe // to their individual severity, where the one listed first will make the most // difference, because it results in the most significant bit of the result. uint imp = 0; - imp <<= 1; imp |= !device[i]->Receiving() || ndr; // use receiving devices if we don't need to detach existing receivers + imp <<= 1; imp |= !device[i]->Receiving(true) || ndr; // use receiving devices if we don't need to detach existing receivers imp <<= 1; imp |= device[i]->Receiving(); // avoid devices that are receiving imp <<= 1; imp |= device[i] == ActualDevice(); // avoid the actual device (in case of Transfer Mode) imp <<= 1; imp |= device[i]->IsPrimaryDevice(); // avoid the primary device |