From 2d40aab1ccbf4ccbb491e35e04f286c8471ef853 Mon Sep 17 00:00:00 2001 From: TangoCash Date: Fri, 12 Jan 2018 14:18:23 +0100 Subject: [PATCH] moving c and t fake positions above 360 degrees --- src/zapit/include/zapit/getservices.h | 3 ++- src/zapit/src/getservices.cpp | 12 ++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/zapit/include/zapit/getservices.h b/src/zapit/include/zapit/getservices.h index 327eb975d..6f7c4b423 100644 --- a/src/zapit/include/zapit/getservices.h +++ b/src/zapit/include/zapit/getservices.h @@ -68,7 +68,8 @@ class CServiceManager int tp_count; uint32_t fake_tid; uint32_t fake_nid; - uint32_t fake_pos; + uint32_t fake_t_pos; + uint32_t fake_c_pos; int newfound; tallchans allchans; diff --git a/src/zapit/src/getservices.cpp b/src/zapit/src/getservices.cpp index a046c3430..4dbe2c0d4 100644 --- a/src/zapit/src/getservices.cpp +++ b/src/zapit/src/getservices.cpp @@ -907,12 +907,11 @@ bool CServiceManager::LoadScanXml(delivery_system_t delsys) InitSatPosition(position, name, false, ALL_SAT); } else if (delivery_name == "terrestrial") { const char * name = xmlGetAttribute(search, "name"); - position = fake_pos++; - position &= 0x0EFF; + position = fake_t_pos++; InitSatPosition(position, name, false, ALL_TERR); } else if(delivery_name == "cable") { const char * name = xmlGetAttribute(search, "name"); - position = fake_pos++; + position = fake_c_pos++; InitSatPosition(position, name, false, ALL_CABLE, xmlGetNumericAttribute(search, "nid", 0)); } else { } @@ -948,7 +947,8 @@ bool CServiceManager::LoadServices(bool only_current) dup_numbers = false; fake_tid = fake_nid = 0; - fake_pos = 0xF00; + fake_t_pos = 0xE11; + fake_c_pos = 0xF01; if (CFEManager::getInstance()->haveSat()) { INFO("Loading satellites..."); @@ -979,12 +979,12 @@ bool CServiceManager::LoadServices(bool only_current) } else if (delivery_name == "terrestrial") { position = GetSatellitePosition(name); if (!position) - position = (0x0EFF & fake_pos++); + position = fake_t_pos++; InitSatPosition(position, name, false, ALL_TERR); } else if (delivery_name == "cable") { position = GetSatellitePosition(name); if (!position) - position = fake_pos++; + position = fake_c_pos++; InitSatPosition(position, name, false, ALL_CABLE); } else { }