mirror of
https://github.com/VDR4Arch/vdr.git
synced 2023-10-10 13:36:52 +02:00
Fixed handling frequencies in NitFilter::Process()
This commit is contained in:
parent
27c7603276
commit
853f6064bf
@ -2016,6 +2016,7 @@ Anssi Hannula <anssi.hannula@gmail.com>
|
||||
for suggesting that cDevice::GetDevice() should prefer any device that's already
|
||||
receiving and doesn't require detatching receivers
|
||||
for improving handling Transfer Mode devices when selecting a device to receive
|
||||
for fixing handling frequencies in NitFilter::Process()
|
||||
|
||||
Antti Hartikainen <ami+vdr@ah.fi>
|
||||
for updating 'S13E' in 'sources.conf'
|
||||
|
2
HISTORY
2
HISTORY
@ -5170,9 +5170,11 @@ Video Disk Recorder Revision History
|
||||
|
||||
- Fixed a busy loop in fast forward if the next video data file is missing
|
||||
(thanks to Reinhard Nissl).
|
||||
- Fixed handling frequencies in NitFilter::Process() (thanks to Anssi Hannula).
|
||||
|
||||
2007-04-28: Version 1.5.3
|
||||
|
||||
- Fixed some spelling errors in 'newplugin' (thanks to Ville Skyttä).
|
||||
- Fixed a busy loop in fast forward if the next video data file is missing
|
||||
(thanks to Reinhard Nissl).
|
||||
- Fixed handling frequencies in NitFilter::Process() (thanks to Anssi Hannula).
|
||||
|
11
nit.c
11
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,7 +144,6 @@ 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())) {
|
||||
@ -153,9 +152,9 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
|
||||
}
|
||||
}
|
||||
}
|
||||
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,7 +194,6 @@ 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())) {
|
||||
@ -204,9 +202,9 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
|
||||
}
|
||||
}
|
||||
}
|
||||
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,7 +251,6 @@ 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())) {
|
||||
@ -262,9 +259,9 @@ void cNitFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Length
|
||||
}
|
||||
}
|
||||
}
|
||||
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;
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user