More cec options for future, not ready

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@604 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
focus
2010-05-28 09:16:03 +00:00
parent 3a1bbc9630
commit 8ebd8cc69a
12 changed files with 99 additions and 79 deletions

View File

@@ -55,70 +55,6 @@ CScanSettings::CScanSettings(void)
satNameNoDiseqc[0] = 0;
}
void CScanSettings::toSatList( CZapitClient::ScanSatelliteList& /*satList*/) const
{
#if 0
satList.clear();
CZapitClient::commandSetScanSatelliteList sat;
sat.diseqc = 0;
strncpy(sat.satName, satNameNoDiseqc, 30);
if(diseqcMode == DISEQC_1_2)
sat.diseqc = -1;
if((scan_mode == 2) || (diseqcMode == DISEQC_1_2)) {
for (int i = 0; i < MAX_SATELLITES; i++) {
if (!strcmp(satName[i], satNameNoDiseqc)) {
if (satDiseqc[i] != -1)
sat.diseqc = satDiseqc[i];
break;
}
}
}
satList.push_back(sat);
#endif
#if 0
if (scan_mode == 2) {
strncpy(sat.satName, satNameNoDiseqc, 30);
sat.diseqc = 0;
for (int i = 0; i < MAX_SATELLITES; i++) {
if (!strcmp(satName[i], satNameNoDiseqc)) {
if (satDiseqc[i] != -1)
sat.diseqc = satDiseqc[i];
break;
}
}
satList.push_back(sat);
}
else if (diseqcMode == NO_DISEQC) {
strncpy(sat.satName, satNameNoDiseqc, 30);
sat.diseqc = 0;
satList.push_back(sat);
}
else if (diseqcMode == DISEQC_1_2) {
strncpy(sat.satName, satNameNoDiseqc, 30);
sat.diseqc = -1;
for (int i = 0; i < MAX_SATELLITES; i++) {
if (!strcmp(satName[i], satNameNoDiseqc)) {
if (satDiseqc[i] != -1)
sat.diseqc = satDiseqc[i];
break;
}
}
satList.push_back(sat);
} else { // scan all sats with configured diseqc
for( int i = 0; i < MAX_SATELLITES; i++) {
if (satDiseqc[i] != -1) {
strncpy(sat.satName, satName[i], 30);
sat.diseqc = satDiseqc[i];
satList.push_back(sat);
}
}
}
#endif
}
void CScanSettings::useDefaults(const delivery_system_t _delivery_system)
{
delivery_system = _delivery_system;