From 782b517c51eaa6d2641fe9b6801afdad50be8586 Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Sun, 20 Mar 2005 18:00:00 +0100 Subject: =?UTF-8?q?Version=201.3.23=20-=20The=20setup=20option=20"DVB/Vide?= =?UTF-8?q?o=20display=20format"=20is=20now=20only=20available=20if=20"Vid?= =?UTF-8?q?eo=20format"=20=20=20is=20set=20to=20"4:3"=20(suggested=20by=20?= =?UTF-8?q?Mikko=20Salo).=20-=20Updated=20the=20Russian=20OSD=20texts=20(t?= =?UTF-8?q?hanks=20to=20Vyacheslav=20Dikonov).=20-=20Dropped=20CA=20suppor?= =?UTF-8?q?t=20for=20the=20old=20'-icam'=20firmware.=20-=20Updated=20the?= =?UTF-8?q?=20Finnish=20OSD=20texts=20(thanks=20to=20Rolf=20Ahrenberg).=20?= =?UTF-8?q?-=20Updated=20the=20Swedish=20OSD=20texts=20(thanks=20to=20Toma?= =?UTF-8?q?s=20Prybil).=20-=20Fixed=20a=20few=20French=20OSD=20texts=20tha?= =?UTF-8?q?t=20were=20in=20the=20wrong=20place.=20-=20Improved=20matching?= =?UTF-8?q?=20timers=20to=20EPG=20events,=20especially=20in=20case=20there?= =?UTF-8?q?=20are=20several=20events=20=20=20with=20the=20same=20VPS=20tim?= =?UTF-8?q?e.=20-=20Fixed=20cDolbyRepacker=20to=20allow=20recording=20ProS?= =?UTF-8?q?ieben=20HD=20broadcasts=20(thanks=20to=20Reinhard=20=20=20Nissl?= =?UTF-8?q?).=20-=20Fixed=20cDvbDevice::SetVideoDisplayFormat()=20in=20cas?= =?UTF-8?q?e=20of=2016:9=20(thanks=20to=20Marco=20Schl=C3=BC=C3=9Fler).=20?= =?UTF-8?q?-=20The=20running=20status=20of=20a=20VPS=20event=20is=20now=20?= =?UTF-8?q?only=20taken=20seriously=20if=20that=20event=20has=20been=20=20?= =?UTF-8?q?=20seen=20within=20the=20last=2030=20seconds=20-=20otherwise=20?= =?UTF-8?q?recording=20is=20done=20as=20if=20no=20VPS=20was=20=20=20availa?= =?UTF-8?q?ble.=20-=20The=20day=20of=20a=20timer=20is=20now=20stored=20as?= =?UTF-8?q?=20a=20full=20date=20in=20ISO=20notation=20("YYYY-MM-DD")=20in?= =?UTF-8?q?=20=20=20'timers.conf'=20and=20for=20the=20result=20of=20the=20?= =?UTF-8?q?SVDRP=20command=20LSTT=20(based=20in=20parts=20on=20a=20=20=20p?= =?UTF-8?q?atch=20by=20Roman=20Krenick=C3=BD).=20-=20Some=20fixes=20to=20a?= =?UTF-8?q?void=20compiler=20warnings=20in=20gcc=204.0=20(thanks=20to=20Vi?= =?UTF-8?q?lle=20Skytt=C3=A4=20for=20reporting=20=20=20these).=20-=20Singl?= =?UTF-8?q?e=20shot=20timers=20are=20now=20reliably=20deleted=20when=20the?= =?UTF-8?q?y=20have=20expired.=20-=20Fixed=20setting=20the=20colored=20but?= =?UTF-8?q?ton=20help=20after=20deleting=20a=20recording=20in=20case=20the?= =?UTF-8?q?=20next=20=20=20menu=20entry=20is=20a=20directory=20(thanks=20t?= =?UTF-8?q?o=20Steffen=20Beyer).=20-=20Improved=20falling=20back=20to=20no?= =?UTF-8?q?rmal=20recording=20if=20the=20VPS=20data=20hasn't=20been=20seen?= =?UTF-8?q?=20for=20more=20=20=20than=2030=20seconds.=20-=20Added=20a=20mi?= =?UTF-8?q?ssing=20cMutexLock=20to=20cRemote::HasKeys()=20(thanks=20to=20W?= =?UTF-8?q?olfgang=20Rohdewald).=20-=20All=20log=20entries=20regarding=20t?= =?UTF-8?q?imers=20now=20contain=20a=20short=20description=20of=20the=20ti?= =?UTF-8?q?mer.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dvbdevice.c | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) (limited to 'dvbdevice.c') diff --git a/dvbdevice.c b/dvbdevice.c index c231122..9c8a0ac 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.124 2005/02/20 13:35:28 kls Exp $ + * $Id: dvbdevice.c 1.127 2005/03/20 10:10:38 kls Exp $ */ #include "dvbdevice.h" @@ -577,7 +577,7 @@ bool cDvbDevice::GrabImage(const char *FileName, bool Jpeg, int Quality, int Siz else { // write PNM file: if (fprintf(f, "P6\n%d\n%d\n255\n", vm.width, vm.height) < 0 || - fwrite(mem, vm.width * vm.height * 3, 1, f) < 0) { + fwrite(mem, vm.width * vm.height * 3, 1, f) != 1) { LOG_ERROR_STR(FileName); result |= 1; } @@ -604,7 +604,7 @@ void cDvbDevice::SetVideoDisplayFormat(eVideoDisplayFormat VideoDisplayFormat) cDevice::SetVideoDisplayFormat(VideoDisplayFormat); if (HasDecoder()) { if (Setup.VideoFormat) { - CHECK(ioctl(fd_video, VIDEO_SET_DISPLAY_FORMAT, VIDEO_CENTER_CUT_OUT)); + CHECK(ioctl(fd_video, VIDEO_SET_DISPLAY_FORMAT, VIDEO_LETTER_BOX)); } else { switch (VideoDisplayFormat) { @@ -757,8 +757,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 if (Ca() > CACONFBASE || Channel->Ca() > CACONFBASE) - needsDetachReceivers = !ciHandler // only LL-firmware can do non-live CA channels - || Ca() != Channel->Ca(); + needsDetachReceivers = Ca() != Channel->Ca(); else if (!IsPrimaryDevice()) result = true; #ifdef DO_REC_AND_PLAY_ON_PRIMARY_DEVICE @@ -781,27 +780,21 @@ bool cDvbDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *Ne bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView) { - bool IsEncrypted = Channel->Ca() > CACONFBASE && !ciHandler; // only LL-firmware can do non-live CA channels - bool DoTune = !dvbTuner->IsTunedTo(Channel); bool TurnOffLivePIDs = HasDecoder() && (DoTune - || IsEncrypted && pidHandles[ptVideo].pid != Channel->Vpid() // CA channels can only be decrypted in "live" mode || !IsPrimaryDevice() || LiveView // for a new live view the old PIDs need to be turned off || pidHandles[ptVideo].pid == Channel->Vpid() // for recording the PIDs must be shifted from DMX_PES_AUDIO/VIDEO to DMX_PES_OTHER ); - bool StartTransferMode = IsPrimaryDevice() && !IsEncrypted && !DoTune + bool StartTransferMode = IsPrimaryDevice() && !DoTune && (LiveView && HasPid(Channel->Vpid() ? Channel->Vpid() : Channel->Apid(0)) && (pidHandles[ptVideo].pid != Channel->Vpid() || pidHandles[ptAudio].pid != Channel->Apid(0))// the PID is already set as DMX_PES_OTHER || !LiveView && (pidHandles[ptVideo].pid == Channel->Vpid() || pidHandles[ptAudio].pid == Channel->Apid(0)) // a recording is going to shift the PIDs from DMX_PES_AUDIO/VIDEO to DMX_PES_OTHER ); - bool TurnOnLivePIDs = HasDecoder() && !StartTransferMode - && (IsEncrypted // CA channels can only be decrypted in "live" mode - || LiveView - ); + bool TurnOnLivePIDs = HasDecoder() && !StartTransferMode && LiveView; #ifndef DO_MULTIPLE_RECORDINGS TurnOffLivePIDs = TurnOnLivePIDs = true; @@ -919,7 +912,7 @@ bool cDvbDevice::CanReplay(void) const if (Receiving()) return false; #endif - return cDevice::CanReplay() && (Ca() <= MAXDEVICES || ciHandler); // with non-LL-firmware we can only replay if there is no CA recording going on + return cDevice::CanReplay(); } bool cDvbDevice::SetPlayMode(ePlayMode PlayMode) -- cgit v1.2.3