diff options
| author | Klaus Schmidinger <vdr@tvdr.de> | 2006-01-07 14:10:17 +0100 |
|---|---|---|
| committer | Klaus Schmidinger <vdr@tvdr.de> | 2006-01-07 14:10:17 +0100 |
| commit | e0d5ebf8fd1d508776d63026a9dd336fbb0d648d (patch) | |
| tree | cf80c8bbd3d669cfe941164955ce04b8a7957637 /dvbdevice.c | |
| parent | 2e0a3f273a18fd6bcf2bc347a6ca449ac7304016 (diff) | |
| download | vdr-e0d5ebf8fd1d508776d63026a9dd336fbb0d648d.tar.gz vdr-e0d5ebf8fd1d508776d63026a9dd336fbb0d648d.tar.bz2 | |
The file 'ca.conf' is obsolete and has been removed; revised all descriptions regarding CICAM
Diffstat (limited to 'dvbdevice.c')
| -rw-r--r-- | dvbdevice.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/dvbdevice.c b/dvbdevice.c index 6f99939e..52c52cea 100644 --- a/dvbdevice.c +++ b/dvbdevice.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: dvbdevice.c 1.147 2006/01/05 15:30:06 kls Exp $ + * $Id: dvbdevice.c 1.148 2006/01/07 14:05:59 kls Exp $ */ #include "dvbdevice.h" @@ -503,7 +503,7 @@ bool cDvbDevice::Ready(void) int cDvbDevice::ProvidesCa(const cChannel *Channel) const { - if (Channel->Ca() >= 0x0100 && ciHandler) { + if (Channel->Ca() >= CA_ENCRYPTED_MIN && ciHandler) { unsigned short ids[MAXCAIDS + 1]; for (int i = 0; i <= MAXCAIDS; i++) // '<=' copies the terminating 0! ids[i] = Channel->Ca(i); @@ -767,7 +767,7 @@ bool cDvbDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *Ne if (Channel->Vpid() && !HasPid(Channel->Vpid()) || Channel->Apid(0) && !HasPid(Channel->Apid(0))) { #ifdef DO_MULTIPLE_RECORDINGS #ifndef DO_MULTIPLE_CA_CHANNELS - if (Ca() > CACONFBASE || Channel->Ca() > CACONFBASE) + if (Ca() >= CA_ENCRYPTED_MIN || Channel->Ca() >= CA_ENCRYPTED_MIN) needsDetachReceivers = Ca() != Channel->Ca(); else #endif |