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

zapit:scan -fix abort ScanTransponder with NIT

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


Origin commit data
------------------
Commit: fd66792efe
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2011-09-08 (Thu, 08 Sep 2011)
This commit is contained in:
Jacek Jendrzej
2011-09-08 17:30:14 +00:00
parent 02dba2ed1a
commit b19104fa07
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -259,7 +259,7 @@ _repeat:
#ifdef NIT_THREAD #ifdef NIT_THREAD
pthread_t nthread; pthread_t nthread;
if(scan_nit) if(!scan_nit)
if(pthread_create(&nthread, 0, nit_thread, (void*)satellitePosition)) { if(pthread_create(&nthread, 0, nit_thread, (void*)satellitePosition)) {
ERROR("pthread_create"); ERROR("pthread_create");
nthread = 0; nthread = 0;
@@ -300,12 +300,12 @@ _repeat:
stI->second.feparams.u.qpsk.fec_inner = tI->second.feparams.u.qpsk.fec_inner; stI->second.feparams.u.qpsk.fec_inner = tI->second.feparams.u.qpsk.fec_inner;
#ifdef NIT_THREAD #ifdef NIT_THREAD
if(scan_nit && nthread) { if(!scan_nit && nthread) {
if(pthread_join(nthread, NULL)) if(pthread_join(nthread, NULL))
perror("pthread_join !!!!!!!!!"); perror("pthread_join !!!!!!!!!");
} }
#else #else
if(scan_nit) { if(!scan_nit) {
printf("[scan] trying to parse NIT\n"); printf("[scan] trying to parse NIT\n");
int status = parse_nit(satellitePosition, freq /*tI->second.feparams.frequency/1000*/); int status = parse_nit(satellitePosition, freq /*tI->second.feparams.frequency/1000*/);
if(status < 0) if(status < 0)
@@ -314,7 +314,7 @@ _repeat:
#endif #endif
printf("[scan] tpid ready: %llx\n", TsidOnid); printf("[scan] tpid ready: %llx\n", TsidOnid);
} }
if(scan_nit) { if(!scan_nit) {
printf("[scan] found %d transponders (%d failed) and %d channels\n", found_transponders, failed_transponders, found_channels); printf("[scan] found %d transponders (%d failed) and %d channels\n", found_transponders, failed_transponders, found_channels);
scantransponders.clear(); scantransponders.clear();
for (tI = nittransponders.begin(); tI != nittransponders.end(); tI++) { for (tI = nittransponders.begin(); tI != nittransponders.end(); tI++) {