mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-26 23:13:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

testing cable problems

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@200 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: 2574197e84
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2010-01-21 (Thu, 21 Jan 2010)



------------------
This commit was generated by Migit
This commit is contained in:
[CST] Focus
2010-01-21 12:30:16 +00:00
parent ae0b0c91fc
commit a160dd7195
3 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/zapit/src/descriptors.cpp
View File

@@ -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;

17
src/zapit/src/getservices.cpp
View File

@@ -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<map<transponder_id_t, transponder>::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);

2
src/zapit/src/scan.cpp
View File

@@ -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);