mirror of
https://github.com/VDR4Arch/vdr.git
synced 2023-10-10 13:36:52 +02:00
GetDevice() now prefers devices that are already receiving
This commit is contained in:
parent
c792c55297
commit
f47655ef0f
7
device.c
7
device.c
@ -4,7 +4,7 @@
|
|||||||
* See the main source file 'vdr.c' for copyright information and
|
* See the main source file 'vdr.c' for copyright information and
|
||||||
* how to reach the author.
|
* how to reach the author.
|
||||||
*
|
*
|
||||||
* $Id: device.c 1.16 2002/09/08 09:03:10 kls Exp $
|
* $Id: device.c 1.17 2002/09/08 09:36:16 kls Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "device.h"
|
#include "device.h"
|
||||||
@ -126,10 +126,13 @@ cDevice *cDevice::GetDevice(const cChannel *Channel, int Priority, bool *NeedsDe
|
|||||||
bool ndr;
|
bool ndr;
|
||||||
if (device[i]->ProvidesChannel(Channel, Priority, &ndr) // this device is basicly able to do the job
|
if (device[i]->ProvidesChannel(Channel, Priority, &ndr) // this device is basicly able to do the job
|
||||||
&& (!d // we don't have a device yet, or...
|
&& (!d // we don't have a device yet, or...
|
||||||
|| device[i]->Priority() < d->Priority() // ...this one has an even lower Priority, or...
|
|| (device[i]->Receiving() && !ndr) // ...this one is already receiving and allows additional receivers, or...
|
||||||
|
|| !d->Receiving() // ...the one we have is not receiving...
|
||||||
|
&& (device[i]->Priority() < d->Priority() // ...this one has an even lower Priority, or...
|
||||||
|| device[i]->Priority() == d->Priority() // ...same Priority...
|
|| device[i]->Priority() == d->Priority() // ...same Priority...
|
||||||
&& device[i]->ProvidesCa(Channel->ca) < d->ProvidesCa(Channel->ca) // ...but this one provides fewer Ca values
|
&& device[i]->ProvidesCa(Channel->ca) < d->ProvidesCa(Channel->ca) // ...but this one provides fewer Ca values
|
||||||
)
|
)
|
||||||
|
)
|
||||||
) {
|
) {
|
||||||
d = device[i];
|
d = device[i];
|
||||||
if (NeedsDetachReceivers)
|
if (NeedsDetachReceivers)
|
||||||
|
Loading…
Reference in New Issue
Block a user