moving c and t fake positions above 360 degrees

This commit is contained in:
TangoCash
2018-01-12 14:18:23 +01:00
committed by Thilo Graf
parent 6eebfd05d0
commit 2d40aab1cc
2 changed files with 8 additions and 7 deletions

View File

@@ -68,7 +68,8 @@ class CServiceManager
int tp_count; int tp_count;
uint32_t fake_tid; uint32_t fake_tid;
uint32_t fake_nid; uint32_t fake_nid;
uint32_t fake_pos; uint32_t fake_t_pos;
uint32_t fake_c_pos;
int newfound; int newfound;
tallchans allchans; tallchans allchans;

View File

@@ -907,12 +907,11 @@ bool CServiceManager::LoadScanXml(delivery_system_t delsys)
InitSatPosition(position, name, false, ALL_SAT); InitSatPosition(position, name, false, ALL_SAT);
} else if (delivery_name == "terrestrial") { } else if (delivery_name == "terrestrial") {
const char * name = xmlGetAttribute(search, "name"); const char * name = xmlGetAttribute(search, "name");
position = fake_pos++; position = fake_t_pos++;
position &= 0x0EFF;
InitSatPosition(position, name, false, ALL_TERR); InitSatPosition(position, name, false, ALL_TERR);
} else if(delivery_name == "cable") { } else if(delivery_name == "cable") {
const char * name = xmlGetAttribute(search, "name"); const char * name = xmlGetAttribute(search, "name");
position = fake_pos++; position = fake_c_pos++;
InitSatPosition(position, name, false, ALL_CABLE, xmlGetNumericAttribute(search, "nid", 0)); InitSatPosition(position, name, false, ALL_CABLE, xmlGetNumericAttribute(search, "nid", 0));
} else { } else {
} }
@@ -948,7 +947,8 @@ bool CServiceManager::LoadServices(bool only_current)
dup_numbers = false; dup_numbers = false;
fake_tid = fake_nid = 0; fake_tid = fake_nid = 0;
fake_pos = 0xF00; fake_t_pos = 0xE11;
fake_c_pos = 0xF01;
if (CFEManager::getInstance()->haveSat()) { if (CFEManager::getInstance()->haveSat()) {
INFO("Loading satellites..."); INFO("Loading satellites...");
@@ -979,12 +979,12 @@ bool CServiceManager::LoadServices(bool only_current)
} else if (delivery_name == "terrestrial") { } else if (delivery_name == "terrestrial") {
position = GetSatellitePosition(name); position = GetSatellitePosition(name);
if (!position) if (!position)
position = (0x0EFF & fake_pos++); position = fake_t_pos++;
InitSatPosition(position, name, false, ALL_TERR); InitSatPosition(position, name, false, ALL_TERR);
} else if (delivery_name == "cable") { } else if (delivery_name == "cable") {
position = GetSatellitePosition(name); position = GetSatellitePosition(name);
if (!position) if (!position)
position = fake_pos++; position = fake_c_pos++;
InitSatPosition(position, name, false, ALL_CABLE); InitSatPosition(position, name, false, ALL_CABLE);
} else { } else {
} }