gui/scan.cpp: set scan channel types in scan flags

Origin commit data
------------------
Branch: ni/coolstream
Commit: 0853780b47
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-04-02 (Mon, 02 Apr 2012)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
[CST] Focus
2012-04-02 15:01:30 +04:00
parent 1b693be7bf
commit 03f3dd140b

View File

@@ -170,6 +170,9 @@ int CScanTs::exec(CMenuTarget* /*parent*/, const std::string & actionKey)
if(scansettings.scan_logical_numbers)
scan_flags |= CServiceScan::SCAN_LOGICAL_NUMBERS;
/* channel types to scan, TV/RADIO/ALL */
scan_flags |= scansettings.scanType;
sat_iterator_t sit;
bool scan_all = actionKey == "all";
bool test = actionKey == "test";
@@ -267,6 +270,8 @@ int CScanTs::exec(CMenuTarget* /*parent*/, const std::string & actionKey)
/* send diseqc repeat to zapit */
g_Zapit->setDiseqcRepeat( scansettings.diseqcRepeat);
/* send scantype to zapit */
g_Zapit->setScanType((CZapitClient::scanType) scansettings.scanType );
#endif
g_Zapit->setScanBouquetMode( (CZapitClient::bouquetMode)scansettings.bouquetMode);
@@ -274,14 +279,11 @@ int CScanTs::exec(CMenuTarget* /*parent*/, const std::string & actionKey)
if(satList.size())
g_Zapit->setScanSatelliteList( satList);
/* send scantype to zapit */
g_Zapit->setScanType((CZapitClient::scanType) scansettings.scanType );
tuned = -1;
paint(test);
/* go */
if(test) {
testFunc();
testFunc();
} else if(manual)
success = g_Zapit->scan_TP(TP);
else if(fast) {