diff options
| -rw-r--r-- | CONTRIBUTORS | 3 | ||||
| -rw-r--r-- | HISTORY | 3 | ||||
| -rw-r--r-- | device.c | 3 |
3 files changed, 8 insertions, 1 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS index a6b67890..c42ce644 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -3377,6 +3377,9 @@ Tony Houghton <h@realh.co.uk> Christian Winkler <winkler_chr@yahoo.de> for reporting a problem with transfer mode on full featured DVB cards for encrypted channels that have no audio pid + for reporting a problem when selecting a device/CAM combination for live viewing, if + the CAM that is known to decrypt the requested channel can not be assigned to the + primary device Dietmar Spingler <d_spingler@gmx.de> for reporting a problem that led to a fix in detaching receivers from devices in case @@ -9009,3 +9009,6 @@ Video Disk Recorder Revision History these objects. - cListObject now implements a private copy constructor and assignment operator, to keep derived objects from calling them implicitly. +- When selecting a device/CAM combination for live viewing, CAMs that are known to decrypt + the requested channel are now given a higher priority than prefering the primary device + (reported by Christian Winkler). @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: device.c 4.17 2017/05/01 13:00:57 kls Exp $ + * $Id: device.c 4.18 2017/05/09 09:03:14 kls Exp $ */ #include "device.h" @@ -293,6 +293,7 @@ cDevice *cDevice::GetDevice(const cChannel *Channel, int Priority, bool LiveView // 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. uint32_t imp = 0; + imp <<= 1; imp |= (LiveView && NumUsableSlots && !HasInternalCam) ? !ChannelCamRelations.CamDecrypt(Channel->GetChannelID(), CamSlots.Get(j)->MasterSlotNumber()) || ndr : 0; // prefer CAMs that are known to decrypt this channel for live viewing, if we don't need to detach existing receivers imp <<= 1; imp |= LiveView ? !device[i]->IsPrimaryDevice() || ndr : 0; // prefer the primary device for live viewing if we don't need to detach existing receivers imp <<= 1; imp |= !device[i]->Receiving() && (device[i] != cTransferControl::ReceiverDevice() || device[i]->IsPrimaryDevice()) || ndr; // use receiving devices if we don't need to detach existing receivers, but avoid primary device in local transfer mode imp <<= 1; imp |= device[i]->Receiving(); // avoid devices that are receiving |