mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-02 18:31:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'multituner', remote-tracking branch 'origin' into dvbsi++

Browse Source
This commit is contained in:
[CST] Focus
2012-03-26 19:49:47 +04:00
parent 811bc7fc20 fb9bda078f
commit 3ed2a3df46
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

@@ -81,6 +81,7 @@ class CZapit : public OpenThreads::Thread
CZapitChannel * current_channel; CZapitChannel * current_channel;
t_channel_id live_channel_id; t_channel_id live_channel_id;
TP_params TP;
CFrontend * live_fe; CFrontend * live_fe;
@@ -145,6 +146,7 @@ class CZapit : public OpenThreads::Thread
bool PrepareChannels(); bool PrepareChannels();
bool StartScan(int scan_mode); bool StartScan(int scan_mode);
bool StartScanTP(TP_params * TPparams);
bool StartFastScan(int scan_mode, int opid); bool StartFastScan(int scan_mode, int opid);
void addChannelToBouquet(const unsigned int bouquet, const t_channel_id channel_id); void addChannelToBouquet(const unsigned int bouquet, const t_channel_id channel_id);

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

@@ -99,7 +99,7 @@ transponder_list_t transponders;
CZapitClient::bouquetMode bouquetMode = CZapitClient::BM_UPDATEBOUQUETS; CZapitClient::bouquetMode bouquetMode = CZapitClient::BM_UPDATEBOUQUETS;
CZapitClient::scanType scanType = CZapitClient::ST_TVRADIO; CZapitClient::scanType scanType = CZapitClient::ST_TVRADIO;
static TP_params TP; //static TP_params TP;
static bool update_pmt = true; static bool update_pmt = true;
/******************************************************************************/ /******************************************************************************/
@@ -727,6 +727,14 @@ bool CZapit::StartScan(int scan_mode)
return true; 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) bool CZapit::StartFastScan(int scan_mode, int opid)
{ {
fast_scan_type_t scant; fast_scan_type_t scant;
@@ -1083,8 +1091,11 @@ printf("[zapit] TP_id %d freq %d rate %d fec %d pol %d\n", TP.TP_id, TP.feparams
CServiceManager::getInstance()->GetSatelliteName(current_channel->getSatellitePosition()); CServiceManager::getInstance()->GetSatelliteName(current_channel->getSatellitePosition());
current_channel = 0; current_channel = 0;
} }
#if 0
PrepareScan(); PrepareScan();
CServiceScan::getInstance()->Start(CServiceScan::SCAN_TRANSPONDER, (void *) &TP); CServiceScan::getInstance()->Start(CServiceScan::SCAN_TRANSPONDER, (void *) &TP);
#endif
StartScanTP(&TP);
break; break;
} }