diff options
| author | Klaus Schmidinger <vdr@tvdr.de> | 2003-05-02 14:30:03 +0200 |
|---|---|---|
| committer | Klaus Schmidinger <vdr@tvdr.de> | 2003-05-02 14:30:03 +0200 |
| commit | a6c1babf9a2827cf91c6c3b9809612927c890317 (patch) | |
| tree | bbf18143c97e87e2d282a3e57189d60fb2083bd5 /dvbdevice.c | |
| parent | 6ffb7912d8f83bf0142c9182957a5ff382c72f2e (diff) | |
| download | vdr-a6c1babf9a2827cf91c6c3b9809612927c890317.tar.gz vdr-a6c1babf9a2827cf91c6c3b9809612927c890317.tar.bz2 | |
Now turning off live PIDs when replaying
Diffstat (limited to 'dvbdevice.c')
| -rw-r--r-- | dvbdevice.c | 42 |
1 files changed, 24 insertions, 18 deletions
diff --git a/dvbdevice.c b/dvbdevice.c index f80f4d17..0c70e5bc 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.57 2003/05/02 09:12:20 kls Exp $ + * $Id: dvbdevice.c 1.58 2003/05/02 12:24:04 kls Exp $ */ #include "dvbdevice.h" @@ -567,6 +567,24 @@ bool cDvbDevice::SetPid(cPidHandle *Handle, int Type, bool On) return true; } +void cDvbDevice::TurnOffLiveMode(void) +{ + // Avoid noise while switching: + + CHECK(ioctl(fd_audio, AUDIO_SET_MUTE, true)); + CHECK(ioctl(fd_video, VIDEO_SET_BLANK, true)); + CHECK(ioctl(fd_audio, AUDIO_CLEAR_BUFFER)); + CHECK(ioctl(fd_video, VIDEO_CLEAR_BUFFER)); + + // Turn off live PIDs: + + DelPid(pidHandles[ptAudio].pid); + DelPid(pidHandles[ptVideo].pid); + DelPid(pidHandles[ptPcr].pid, ptPcr); + DelPid(pidHandles[ptTeletext].pid); + DelPid(pidHandles[ptDolby].pid); +} + bool cDvbDevice::ProvidesSource(int Source) const { int type = Source & cSource::st_Mask; @@ -649,23 +667,8 @@ bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView) // Turn off live PIDs if necessary: - if (TurnOffLivePIDs) { - - // Avoid noise while switching: - - CHECK(ioctl(fd_audio, AUDIO_SET_MUTE, true)); - CHECK(ioctl(fd_video, VIDEO_SET_BLANK, true)); - CHECK(ioctl(fd_audio, AUDIO_CLEAR_BUFFER)); - CHECK(ioctl(fd_video, VIDEO_CLEAR_BUFFER)); - - // Turn off live PIDs: - - DelPid(pidHandles[ptAudio].pid); - DelPid(pidHandles[ptVideo].pid); - DelPid(pidHandles[ptPcr].pid, ptPcr); - DelPid(pidHandles[ptTeletext].pid); - DelPid(pidHandles[ptDolby].pid); - } + if (TurnOffLivePIDs) + TurnOffLiveMode(); dvbTuner->Set(Channel, DoTune); if (DoTune) { @@ -783,6 +786,9 @@ bool cDvbDevice::SetPlayMode(ePlayMode PlayMode) siProcessor->SetStatus(true); break; case pmAudioVideo: + if (playMode == pmNone) + TurnOffLiveMode(); + // continue with next... case pmAudioOnlyBlack: if (siProcessor) siProcessor->SetStatus(false); |