mirror of
https://github.com/VDR4Arch/vdr.git
synced 2023-10-10 13:36:52 +02:00
Fixed switching channels while an encrypted channel is being recorded (cont'd)
This commit is contained in:
parent
425cb11d61
commit
70ea2cbbd1
3
HISTORY
3
HISTORY
@ -2914,7 +2914,8 @@ Video Disk Recorder Revision History
|
|||||||
a problem with long event texts in the "Classic VDR" skin).
|
a problem with long event texts in the "Classic VDR" skin).
|
||||||
- Fixed switching channels while an encrypted channel is being recorded, because the
|
- Fixed switching channels while an encrypted channel is being recorded, because the
|
||||||
channel was switched if the new channel was on the same transponder and was
|
channel was switched if the new channel was on the same transponder and was
|
||||||
a radio channel (thanks to Martin Dauskardt for reporting this one).
|
a radio channel or an unencrypted channel (thanks to Martin Dauskardt for reporting
|
||||||
|
this one).
|
||||||
- No longer using the external 'find' command to scan the video directory for
|
- No longer using the external 'find' command to scan the video directory for
|
||||||
recordings (based on a suggestion by Mirko Dölle).
|
recordings (based on a suggestion by Mirko Dölle).
|
||||||
- The list of recordings is now kept statically in memory to avoid long delays
|
- The list of recordings is now kept statically in memory to avoid long delays
|
||||||
|
@ -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: dvbdevice.c 1.92 2004/06/19 08:52:24 kls Exp $
|
* $Id: dvbdevice.c 1.93 2004/06/19 13:48:00 kls Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "dvbdevice.h"
|
#include "dvbdevice.h"
|
||||||
@ -684,7 +684,7 @@ bool cDvbDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *Ne
|
|||||||
if (dvbTuner->IsTunedTo(Channel)) {
|
if (dvbTuner->IsTunedTo(Channel)) {
|
||||||
if (Channel->Vpid() && !HasPid(Channel->Vpid()) || Channel->Apid1() && !HasPid(Channel->Apid1())) {
|
if (Channel->Vpid() && !HasPid(Channel->Vpid()) || Channel->Apid1() && !HasPid(Channel->Apid1())) {
|
||||||
#ifdef DO_MULTIPLE_RECORDINGS
|
#ifdef DO_MULTIPLE_RECORDINGS
|
||||||
if (Channel->Ca() > CACONFBASE)
|
if (Ca() > CACONFBASE || Channel->Ca() > CACONFBASE)
|
||||||
needsDetachReceivers = !ciHandler // only LL-firmware can do non-live CA channels
|
needsDetachReceivers = !ciHandler // only LL-firmware can do non-live CA channels
|
||||||
|| Ca() != Channel->Ca();
|
|| Ca() != Channel->Ca();
|
||||||
else if (!IsPrimaryDevice())
|
else if (!IsPrimaryDevice())
|
||||||
|
Loading…
Reference in New Issue
Block a user