summaryrefslogtreecommitdiff
path: root/device.c
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2006-08-27 08:42:31 +0200
committerKlaus Schmidinger <vdr@tvdr.de>2006-08-27 08:42:31 +0200
commitc2e2673629c0a721e721f64e0dbec85a02f7b013 (patch)
tree39516640af46e195a6a8f62e6a53a170cbf3bc64 /device.c
parent1305406f0a87a17a81c3c2eeead847fd8a9c3587 (diff)
downloadvdr-c2e2673629c0a721e721f64e0dbec85a02f7b013.tar.gz
vdr-c2e2673629c0a721e721f64e0dbec85a02f7b013.tar.bz2
Revoked the change to cDevice::GetDevice() that was introduced in version 1.4.1-21.4.2
Diffstat (limited to 'device.c')
-rw-r--r--device.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/device.c b/device.c
index a1a1d698..c17cb0b5 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: device.c 1.135 2006/08/12 11:33:34 kls Exp $
+ * $Id: device.c 1.136 2006/08/26 14:11:03 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(true) || ndr; // use receiving devices if we don't need to detach existing receivers
+ 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(); // avoid devices that are receiving
imp <<= 1; imp |= device[i] == cTransferControl::ReceiverDevice(); // avoid the Transfer Mode receiver device
imp <<= 8; imp |= min(max(device[i]->Priority() + MAXPRIORITY, 0), 0xFF); // use the device with the lowest priority (+MAXPRIORITY to assure that values -99..99 can be used)