diff options
| author | Klaus Schmidinger <vdr@tvdr.de> | 2003-04-19 10:59:53 +0200 |
|---|---|---|
| committer | Klaus Schmidinger <vdr@tvdr.de> | 2003-04-19 10:59:53 +0200 |
| commit | 2c4da57287a1cefeb4596af44379ee24168406cb (patch) | |
| tree | 3a1c3bc527d39657282d1ad0ed846265200fec17 /dvbdevice.c | |
| parent | d7c5e26d31fea089646b0b12e5c58ea92aec5b26 (diff) | |
| download | vdr-2c4da57287a1cefeb4596af44379ee24168406cb.tar.gz vdr-2c4da57287a1cefeb4596af44379ee24168406cb.tar.bz2 | |
Re-enabled CAM communication during replay and on non-Ca channels
Diffstat (limited to 'dvbdevice.c')
| -rw-r--r-- | dvbdevice.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/dvbdevice.c b/dvbdevice.c index 19a7c431..b1c50624 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.52 2003/04/18 11:35:08 kls Exp $ + * $Id: dvbdevice.c 1.53 2003/04/19 10:29:09 kls Exp $ */ #include "dvbdevice.h" @@ -264,7 +264,7 @@ void cDvbTuner::Action(void) } } if (tunerStatus >= tsLocked) { - if (ciHandler && channel.Ca() > CACONFBASE) { + if (ciHandler) { if (ciHandler->Process()) { if (tunerStatus != tsCam) {//XXX TODO update in case the CA descriptors have changed for (int Slot = 0; Slot < ciHandler->NumSlots(); Slot++) { @@ -777,15 +777,11 @@ bool cDvbDevice::SetPlayMode(ePlayMode PlayMode) CHECK(ioctl(fd_audio, AUDIO_SET_MUTE, false)); if (siProcessor) siProcessor->SetStatus(true); - if (ciHandler) - ciHandler->SetEnabled(true); break; case pmAudioVideo: case pmAudioOnlyBlack: if (siProcessor) siProcessor->SetStatus(false); - if (ciHandler) - ciHandler->SetEnabled(false); CHECK(ioctl(fd_video, VIDEO_SET_BLANK, true)); CHECK(ioctl(fd_audio, AUDIO_SELECT_SOURCE, AUDIO_SOURCE_MEMORY)); CHECK(ioctl(fd_audio, AUDIO_SET_AV_SYNC, PlayMode == pmAudioVideo)); @@ -796,8 +792,6 @@ bool cDvbDevice::SetPlayMode(ePlayMode PlayMode) case pmAudioOnly: if (siProcessor) siProcessor->SetStatus(false); - if (ciHandler) - ciHandler->SetEnabled(false); CHECK(ioctl(fd_video, VIDEO_SET_BLANK, true)); CHECK(ioctl(fd_audio, AUDIO_STOP, true)); CHECK(ioctl(fd_audio, AUDIO_CLEAR_BUFFER)); @@ -809,8 +803,6 @@ bool cDvbDevice::SetPlayMode(ePlayMode PlayMode) case pmExtern_THIS_SHOULD_BE_AVOIDED: if (siProcessor) siProcessor->SetStatus(false); - if (ciHandler) - ciHandler->SetEnabled(false); close(fd_video); close(fd_audio); fd_video = fd_audio = -1; |