From 82c3d65d4add4db4356a3b83c383adee9171098a Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Mon, 30 Apr 2007 18:00:00 +0200 Subject: =?UTF-8?q?Version=201.4.6-1=20-=20Fixed=20a=20busy=20loop=20in=20?= =?UTF-8?q?fast=20forward=20if=20the=20next=20video=20data=20file=20is=20m?= =?UTF-8?q?issing=20=20=20(thanks=20to=20Reinhard=20Nissl).=20-=20Fixed=20?= =?UTF-8?q?handling=20frequencies=20in=20NitFilter::Process()=20(thanks=20?= =?UTF-8?q?to=20Anssi=20Hannula).=20-=20Fixed=20handling=20ChannelUp/Down?= =?UTF-8?q?=20keys=20if=20there=20is=20currently=20a=20replay=20running=20?= =?UTF-8?q?=20=20(thanks=20to=20Marco=20Schl=C3=BC=C3=9Fler).=20-=20Increa?= =?UTF-8?q?sed=20the=20maximum=20number=20of=20CA=20system=20ids=20to=20co?= =?UTF-8?q?pe=20with=20the=20AlphaCrypt=20=20=20CAM's=20version=203.11=20f?= =?UTF-8?q?irmware.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nit.c | 53 +++++++++++++++++++++++++---------------------------- 1 file changed, 25 insertions(+), 28 deletions(-) (limited to 'nit.c') diff --git a/nit.c b/nit.c index 4f53562..9291c96 100644 --- a/nit.c +++ b/nit.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: nit.c 1.13 2006/10/28 12:31:04 kls Exp $ + * $Id: nit.c 1.14 2007/04/29 11:35:33 kls Exp $ */ #include "nit.h" @@ -144,17 +144,16 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length for (cChannel *Channel = Channels.First(); Channel; Channel = Channels.Next(Channel)) { if (!Channel->GroupSep() && Channel->Source() == Source && Channel->Nid() == ts.getOriginalNetworkId() && Channel->Tid() == ts.getTransportStreamId()) { if (Setup.UpdateChannels >= 5) { - if (ISTRANSPONDER(cChannel::Transponder(Frequency, Polarization), Transponder())) { // only modify channels if we're actually receiving this transponder - if (!ISTRANSPONDER(cChannel::Transponder(Frequency, Polarization), Channel->Transponder())) { - for (int n = 0; n < NumFrequencies; n++) { - if (ISTRANSPONDER(cChannel::Transponder(Frequencies[n], Polarization), Channel->Transponder())) { - Frequency = Frequencies[n]; - break; - } + if (!ISTRANSPONDER(cChannel::Transponder(Frequency, Polarization), Channel->Transponder())) { + for (int n = 0; n < NumFrequencies; n++) { + if (ISTRANSPONDER(cChannel::Transponder(Frequencies[n], Polarization), Channel->Transponder())) { + Frequency = Frequencies[n]; + break; } - } - Channel->SetSatTransponderData(Source, Frequency, Polarization, SymbolRate, CodeRate); + } } + if (ISTRANSPONDER(cChannel::Transponder(Frequency, Polarization), Transponder())) // only modify channels if we're actually receiving this transponder + Channel->SetSatTransponderData(Source, Frequency, Polarization, SymbolRate, CodeRate); } found = true; } @@ -195,17 +194,16 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length for (cChannel *Channel = Channels.First(); Channel; Channel = Channels.Next(Channel)) { if (!Channel->GroupSep() && Channel->Source() == Source && Channel->Nid() == ts.getOriginalNetworkId() && Channel->Tid() == ts.getTransportStreamId()) { if (Setup.UpdateChannels >= 5) { - if (ISTRANSPONDER(Frequency / 1000, Transponder())) { // only modify channels if we're actually receiving this transponder - if (!ISTRANSPONDER(Frequency / 1000, Channel->Transponder())) { - for (int n = 0; n < NumFrequencies; n++) { - if (ISTRANSPONDER(Frequencies[n] / 1000, Channel->Transponder())) { - Frequency = Frequencies[n]; - break; - } + if (!ISTRANSPONDER(Frequency / 1000, Channel->Transponder())) { + for (int n = 0; n < NumFrequencies; n++) { + if (ISTRANSPONDER(Frequencies[n] / 1000, Channel->Transponder())) { + Frequency = Frequencies[n]; + break; } - } - Channel->SetCableTransponderData(Source, Frequency, Modulation, SymbolRate, CodeRate); + } } + if (ISTRANSPONDER(Frequency / 1000, Transponder())) // only modify channels if we're actually receiving this transponder + Channel->SetCableTransponderData(Source, Frequency, Modulation, SymbolRate, CodeRate); } found = true; } @@ -253,17 +251,16 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length for (cChannel *Channel = Channels.First(); Channel; Channel = Channels.Next(Channel)) { if (!Channel->GroupSep() && Channel->Source() == Source && Channel->Nid() == ts.getOriginalNetworkId() && Channel->Tid() == ts.getTransportStreamId()) { if (Setup.UpdateChannels >= 5) { - if (ISTRANSPONDER(Frequency / 1000000, Transponder())) { // only modify channels if we're actually receiving this transponder - if (!ISTRANSPONDER(Frequency / 1000000, Channel->Transponder())) { - for (int n = 0; n < NumFrequencies; n++) { - if (ISTRANSPONDER(Frequencies[n] / 1000000, Channel->Transponder())) { - Frequency = Frequencies[n]; - break; - } + if (!ISTRANSPONDER(Frequency / 1000000, Channel->Transponder())) { + for (int n = 0; n < NumFrequencies; n++) { + if (ISTRANSPONDER(Frequencies[n] / 1000000, Channel->Transponder())) { + Frequency = Frequencies[n]; + break; } - } - Channel->SetTerrTransponderData(Source, Frequency, Bandwidth, Constellation, Hierarchy, CodeRateHP, CodeRateLP, GuardInterval, TransmissionMode); + } } + if (ISTRANSPONDER(Frequency / 1000000, Transponder())) // only modify channels if we're actually receiving this transponder + Channel->SetTerrTransponderData(Source, Frequency, Bandwidth, Constellation, Hierarchy, CodeRateHP, CodeRateLP, GuardInterval, TransmissionMode); } found = true; } -- cgit v1.2.3