frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00
Code Issues Releases Wiki Activity

Now avoiding the 'actual' device when starting a recording, so that a Transfer Mode for live tv isn't interrupted

Browse Source
This commit is contained in:
Klaus Schmidinger 2006-04-09 10:47:53 +02:00
parent bfce2b3dba
commit a6d5d36043
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
HISTORY
View File

@ -4478,3 +4478,5 @@ Video Disk Recorder Revision History
margin. margin.
- Fixed handling VPS timers in case the primary device needs to switch to the - Fixed handling VPS timers in case the primary device needs to switch to the
timer's transponder. timer's transponder.
- Now avoiding the 'actual' device when starting a recording, so that a Transfer
Mode for live tv isn't interrupted.

19
device.c
View File

@ -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.126 2006/04/02 13:08:08 kls Exp $ * $Id: device.c 1.127 2006/04/09 10:46:36 kls Exp $
*/ */
#include "device.h" #include "device.h"
@ -281,27 +281,30 @@ cDevice *cDevice::GetDevice(int Index)
cDevice *cDevice::GetDevice(const cChannel *Channel, int Priority, bool *NeedsDetachReceivers) cDevice *cDevice::GetDevice(const cChannel *Channel, int Priority, bool *NeedsDetachReceivers)
{ {
cDevice *d = NULL; cDevice *d = NULL;
int select = 8, pri; int select = INT_MAX;
for (int i = 0; i < numDevices; i++) { for (int i = 0; i < numDevices; i++) {
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
int pri;
if (device[i]->Receiving() && !ndr) if (device[i]->Receiving() && !ndr)
pri = 0; // receiving and allows additional receivers pri = 0; // receiving and allows additional receivers
else if (d && !device[i]->Receiving() && device[i]->ProvidesCa(Channel) < d->ProvidesCa(Channel)) else if (!device[i]->Receiving(true) && d && device[i]->ProvidesCa(Channel) < d->ProvidesCa(Channel))
pri = 1; // free and fewer Ca's pri = 1; // free and fewer Ca's
else if (!device[i]->Receiving() && !device[i]->HasDecoder()) else if (!device[i]->Receiving() && !device[i]->HasDecoder())
pri = 2; // free and not a full featured card pri = 2; // free and not a full featured card
else if (!device[i]->Receiving() && device[i] != ActualDevice())
pri = 3; // free and not the actual device
else if (!device[i]->Receiving() && !device[i]->IsPrimaryDevice()) else if (!device[i]->Receiving() && !device[i]->IsPrimaryDevice())
pri = 3; // free and not the primary device pri = 4; // free and not the primary device
else if (!device[i]->Receiving()) else if (!device[i]->Receiving())
pri = 4; // free pri = 5; // free
else if (d && device[i]->Priority() < d->Priority()) else if (d && device[i]->Priority() < d->Priority())
pri = 5; // receiving but priority is lower pri = 6; // receiving but priority is lower
else if (d && device[i]->Priority() == d->Priority() && device[i]->ProvidesCa(Channel) < d->ProvidesCa(Channel)) else if (d && device[i]->Priority() == d->Priority() && device[i]->ProvidesCa(Channel) < d->ProvidesCa(Channel))
pri = 6; // receiving with same priority but fewer Ca's pri = 7; // receiving with same priority but fewer Ca's
else else
pri = 7; // all others pri = 8; // all others
if (pri <= select) { if (pri <= select) {
select = pri; select = pri;
d = device[i]; d = device[i];