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

src/zapit.cpp: move TP_params TP inside class,

Browse Source 
add method to start manual TP scan

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


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7404dae1b2
Author: nightshad <nightshad@e54a6e83-5905-42d5-8d5c-058d10e6a962>
Date: 2012-04-03 (Tue, 03 Apr 2012)



------------------
This commit was generated by Migit
This commit is contained in:
nightshad
2012-04-03 15:56:12 +00:00
parent 863b2bb179
commit 6cf1c26667
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/zapit/include/zapit/zapit.h
View File

@@ -79,6 +79,7 @@ class CZapit : public OpenThreads::Thread
CZapitChannel * current_channel;
t_channel_id live_channel_id;
TP_params TP;
audio_map_t audio_map;
bool current_is_nvod;
@@ -140,6 +141,7 @@ class CZapit : public OpenThreads::Thread
bool PrepareChannels();
bool StartScan(int scan_mode);
bool StartScanTP(TP_params * TPparams);
bool StartFastScan(int scan_mode, int opid);
void addChannelToBouquet(const unsigned int bouquet, const t_channel_id channel_id);

13
src/zapit/src/zapit.cpp
View File

@@ -97,7 +97,7 @@ transponder_list_t transponders;
CZapitClient::bouquetMode bouquetMode = CZapitClient::BM_UPDATEBOUQUETS;
CZapitClient::scanType scanType = CZapitClient::ST_TVRADIO;
static TP_params TP;
//static TP_params TP;
static bool update_pmt = true;
/******************************************************************************/
@@ -701,6 +701,14 @@ bool CZapit::StartScan(int scan_mode)
return true;
}
bool CZapit::StartScanTP(TP_params * TPparams)
{
PrepareScan();
CServiceScan::getInstance()->Start(CServiceScan::SCAN_TRANSPONDER, (void *) TPparams);
return true;
}
bool CZapit::StartFastScan(int scan_mode, int opid)
{
fast_scan_type_t scant;
@@ -1059,8 +1067,11 @@ printf("[zapit] TP_id %d freq %d rate %d fec %d pol %d\n", TP.TP_id, TP.feparams
//if(satellitePositions.find(current_channel->getSatellitePosition()) != satellitePositions.end())
current_channel = 0;
}
#if 0
PrepareScan();
CServiceScan::getInstance()->Start(CServiceScan::SCAN_TRANSPONDER, (void *) &TP);
#endif
StartScanTP(&TP);
break;
}