From ccc94e73dc4ea7d42434c8ed64b8263cd9b8fcc4 Mon Sep 17 00:00:00 2001 From: "[CST] Focus" Date: Sun, 15 Apr 2012 16:18:06 +0400 Subject: [PATCH] zapit/src/scannit.cpp: fix copy-paste; dont change fec, if its FEC_AUTO --- src/zapit/src/scannit.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/zapit/src/scannit.cpp b/src/zapit/src/scannit.cpp index cfe6d0b90..dd33b336f 100644 --- a/src/zapit/src/scannit.cpp +++ b/src/zapit/src/scannit.cpp @@ -302,13 +302,13 @@ bool CNit::ParseSatelliteDescriptor(SatelliteDeliverySystemDescriptor * sd, Tran feparams.u.qpsk.symbol_rate = sd->getSymbolRate() * 100; int fec_inner = CFrontend::getCodeRate(sd->getFecInner(), sd->getModulationSystem()); - if(sd->getModulation() == 2) + if(sd->getModulation() == 2 && ((fe_code_rate_t) fec_inner != FEC_AUTO)) fec_inner += 9; feparams.u.qpsk.fec_inner = (fe_code_rate_t) fec_inner; feparams.frequency = (int) 1000 * (int) round ((double) feparams.frequency / (double) 1000); - freq_id_t freq = CREATE_FREQ_ID(feparams->frequency, false); + freq_id_t freq = CREATE_FREQ_ID(feparams.frequency, false); transponder_id_t TsidOnid = CREATE_TRANSPONDER_ID64( freq, satellitePosition, tsinfo->getTransportStreamId(), tsinfo->getOriginalNetworkId()); @@ -333,7 +333,7 @@ bool CNit::ParseCableDescriptor(CableDeliverySystemDescriptor * sd, TransportStr if(feparams.frequency > 1000*1000) feparams.frequency /= 1000; - freq_id_t freq = CREATE_FREQ_ID(feparams->frequency, true); + freq_id_t freq = CREATE_FREQ_ID(feparams.frequency, true); transponder_id_t TsidOnid = CREATE_TRANSPONDER_ID64( freq, satellitePosition, tsinfo->getTransportStreamId(), tsinfo->getOriginalNetworkId());