From c5bd64aad8c7a55fd09afaef742992c4bcc701a6 Mon Sep 17 00:00:00 2001 From: "[CST] Focus" Date: Sun, 22 Apr 2012 13:11:55 +0400 Subject: [PATCH] zapit/src/zapit.cpp, zapit/src/femanager.cpp: change save/restore lastSatellitePosition to rotor position Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/597ad235b2827f7186b7c218f8b3e9087150e3c5 Author: [CST] Focus Date: 2012-04-22 (Sun, 22 Apr 2012) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/zapit/src/femanager.cpp | 4 ++-- src/zapit/src/zapit.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/zapit/src/femanager.cpp b/src/zapit/src/femanager.cpp index a572efffa..8868cd11a 100644 --- a/src/zapit/src/femanager.cpp +++ b/src/zapit/src/femanager.cpp @@ -178,7 +178,7 @@ bool CFEManager::loadSettings() fe_config.uni_scr = getConfigValue(fe, "uni_scr", -1); fe_config.uni_qrg = getConfigValue(fe, "uni_qrg", 0); - fe->setCurrentSatellitePosition(getConfigValue(fe, "lastSatellitePosition", 0)); + fe->setRotorSatellitePosition(getConfigValue(fe, "lastSatellitePosition", 0)); //fe->setDiseqcType((diseqc_t) fe_config.diseqcType); fe->setDiseqcType(diseqcType); @@ -243,7 +243,7 @@ void CFEManager::saveSettings(bool write) setConfigValue(fe, "highVoltage", fe_config.highVoltage); setConfigValue(fe, "uni_scr", fe_config.uni_scr); setConfigValue(fe, "uni_qrg", fe_config.uni_qrg); - setConfigValue(fe, "lastSatellitePosition", fe->getCurrentSatellitePosition()); + setConfigValue(fe, "lastSatellitePosition", fe->getRotorSatellitePosition()); std::vector satList; satellite_map_t satellites = fe->getSatellites(); diff --git a/src/zapit/src/zapit.cpp b/src/zapit/src/zapit.cpp index 363ab5735..393064e52 100644 --- a/src/zapit/src/zapit.cpp +++ b/src/zapit/src/zapit.cpp @@ -199,7 +199,7 @@ void CZapit::SaveSettings(bool write) #if 1 /* FIXME FE specific */ configfile.setBool("highVoltage", config.highVoltage); - configfile.setInt32("lastSatellitePosition", live_fe->getCurrentSatellitePosition()); + configfile.setInt32("lastSatellitePosition", live_fe->getRotorSatellitePosition()); configfile.setInt32("diseqcRepeats", live_fe->getDiseqcRepeats()); configfile.setInt32("diseqcType", live_fe->getDiseqcType()); configfile.setInt32("motorRotationSpeed", config.motorRotationSpeed); @@ -317,7 +317,7 @@ void CZapit::ConfigFrontend() fe->configUnicable(config.uni_scr, config.uni_qrg); fe->setDiseqcType(diseqcType); fe->setDiseqcRepeats(configfile.getInt32("diseqcRepeats", 0)); - fe->setCurrentSatellitePosition(configfile.getInt32("lastSatellitePosition", 0)); + fe->setRotorSatellitePosition(configfile.getInt32("lastSatellitePosition", 0)); fe->setSatellites(CServiceManager::getInstance()->SatelliteList()); } }