diff --git a/src/zapit/src/descriptors.cpp b/src/zapit/src/descriptors.cpp index 00e8329f0..b0c9ea8f4 100644 --- a/src/zapit/src/descriptors.cpp +++ b/src/zapit/src/descriptors.cpp @@ -360,7 +360,7 @@ int cable_delivery_system_descriptor(const unsigned char * const buffer, t_trans //printf("TP:: freq %X Frequency %X ID %llx\n", freq, feparams.frequency, CREATE_TRANSPONDER_ID_FROM_SATELLITEPOSITION_ORIGINALNETWORK_TRANSPORTSTREAM_ID(freq, satellitePosition, original_network_id, transport_stream_id)); feparams.frequency = (int) 1000 * (int) round ((double) feparams.frequency / (double) 1000); - freq = feparams.frequency / 1000; + freq = feparams.frequency / 100; TsidOnid = CREATE_TRANSPONDER_ID_FROM_SATELLITEPOSITION_ORIGINALNETWORK_TRANSPORTSTREAM_ID(freq, satellitePosition, original_network_id, transport_stream_id); add_to_scan(TsidOnid, &feparams, 0); return 0; diff --git a/src/zapit/src/getservices.cpp b/src/zapit/src/getservices.cpp index f8643fbdc..931fce472 100644 --- a/src/zapit/src/getservices.cpp +++ b/src/zapit/src/getservices.cpp @@ -81,7 +81,9 @@ void ParseTransponders(xmlNodePtr node, t_satellite_position satellitePosition, feparams.u.qam.modulation = (fe_modulation_t) xmlGetNumericAttribute(node, "mod", 0); if (feparams.frequency > 1000*1000) - feparams.frequency=feparams.frequency/1000; //transponderlist was read from tuxbox + feparams.frequency = feparams.frequency/1000; //transponderlist was read from tuxbox + + //feparams.frequency = (int) 1000 * (int) round ((double) feparams.frequency / (double) 1000); } else { feparams.u.qpsk.fec_inner = (fe_code_rate_t) xmlGetNumericAttribute(node, "fec", 0); feparams.u.qpsk.symbol_rate = xmlGetNumericAttribute(node, "sr", 0); @@ -90,10 +92,15 @@ void ParseTransponders(xmlNodePtr node, t_satellite_position satellitePosition, if(feparams.u.qpsk.symbol_rate < 50000) feparams.u.qpsk.symbol_rate = feparams.u.qpsk.symbol_rate * 1000; - if(feparams.frequency < 20000) feparams.frequency = feparams.frequency*1000; + if(feparams.frequency < 20000) + feparams.frequency = feparams.frequency*1000; + else + feparams.frequency = (int) 1000 * (int) round ((double) feparams.frequency / (double) 1000); } - feparams.frequency = (int) 1000 * (int) round ((double) feparams.frequency / (double) 1000); - freq = feparams.frequency/1000; + if(cable) + freq = feparams.frequency/100; + else + freq = feparams.frequency/1000; transponder_id_t tid = CREATE_TRANSPONDER_ID_FROM_SATELLITEPOSITION_ORIGINALNETWORK_TRANSPORTSTREAM_ID(freq, satellitePosition,original_network_id,transport_stream_id); pair::iterator,bool> ret; @@ -611,7 +618,7 @@ void SaveServices(bool tocopy) int i = 0; for (tallchans::iterator it = allchans.begin(); it != allchans.end(); it++) if (chans_processed.find(it->first) == chans_processed.end()) - printf("unsed channel %d sat %d freq %d sid %04X: %s\n", ++i, it->second.getSatellitePosition(), it->second.getFreqId(), it->second.getServiceId(), it->second.getName().c_str()); + printf("unused channel %d sat %d freq %d sid %04X: %s\n", ++i, it->second.getSatellitePosition(), it->second.getFreqId(), it->second.getServiceId(), it->second.getName().c_str()); chans_processed.clear(); #endif printf("processed channels: %d\n", processed); diff --git a/src/zapit/src/scan.cpp b/src/zapit/src/scan.cpp index 1636728c0..61afc015b 100644 --- a/src/zapit/src/scan.cpp +++ b/src/zapit/src/scan.cpp @@ -322,7 +322,7 @@ int scan_transponder(xmlNodePtr transponder, uint8_t diseqc_pos, t_satellite_pos if(cable) { if (feparams.frequency > 1000*1000) feparams.frequency=feparams.frequency/1000; //transponderlist was read from tuxbox - feparams.frequency = (int) 1000 * (int) round ((double) feparams.frequency / (double) 1000); + //feparams.frequency = (int) 1000 * (int) round ((double) feparams.frequency / (double) 1000); } else feparams.frequency = (int) 1000 * (int) round ((double) feparams.frequency / (double) 1000);