From 3e3abc65f1c85c18acec2a0bd91e1f7dc6778841 Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Sun, 25 Jan 2004 14:04:03 +0100 Subject: Fixed frequency handling when setting the CA descriptors in cDvbTuner::Action() --- CONTRIBUTORS | 2 ++ HISTORY | 4 +++- dvbdevice.c | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CONTRIBUTORS b/CONTRIBUTORS index f07b4207..d8f6a2bf 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -647,6 +647,8 @@ Teemu Rantanen Jan Ekholm for adding/improving some Swedish language OSD texts for reporting a compiler warning in g++ 3.2.3 regarding cReplayControl::Show() + for reporting and helping to debug a problem in frequency handling when setting + the CA descriptors in cDvbTuner::Action() Marcel Wiesweg for pointing out a problem with high CPU load during replay diff --git a/HISTORY b/HISTORY index f293b98e..f977f5a0 100644 --- a/HISTORY +++ b/HISTORY @@ -2611,9 +2611,11 @@ Video Disk Recorder Revision History - Fixed setting the source type for newly detected terrestrial transponders (thanks to Christian Tramnitz for his support in debugging this). -2004-01-24: Version 1.3.3 +2004-01-25: Version 1.3.3 - Completed the Finnish OSD texts (thanks to Rolf Ahrenberg). - Added ISO639LanguageDescriptor to 'libsi'. - Changed the 'languageCode' members in the descriptor classes of 'libsi' to 'char[4]' and setting the 4th byte to 0 for easier handling. +- Fixed frequency handling when setting the CA descriptors in cDvbTuner::Action() + (thanks to Jan Ekholm for reporting and helping to debug this one). diff --git a/dvbdevice.c b/dvbdevice.c index cddde8e2..01a9a6c6 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.78 2004/01/10 12:21:41 kls Exp $ + * $Id: dvbdevice.c 1.79 2004/01/25 13:50:21 kls Exp $ */ #include "dvbdevice.h" @@ -272,7 +272,7 @@ void cDvbTuner::Action(void) if (ciHandler->Process() && useCa) { if (tunerStatus == tsLocked) { for (int Slot = 0; Slot < ciHandler->NumSlots(); Slot++) { - cCiCaPmt CaPmt(channel.Source(), channel.Frequency(), channel.Sid(), ciHandler->GetCaSystemIds(Slot)); + cCiCaPmt CaPmt(channel.Source(), channel.Transponder(), channel.Sid(), ciHandler->GetCaSystemIds(Slot)); if (CaPmt.Valid()) { CaPmt.AddPid(channel.Vpid(), 2); CaPmt.AddPid(channel.Apid1(), 4); -- cgit v1.2.3