From 910ba7028daa3a45bd3e37a4978bcd2bcd3ce920 Mon Sep 17 00:00:00 2001 From: striper Date: Mon, 19 Sep 2011 08:02:27 +0000 Subject: [PATCH] - improve readability git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1701 e54a6e83-5905-42d5-8d5c-058d10e6a962 --- src/zapit/src/zapit.cpp | 46 ++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/src/zapit/src/zapit.cpp b/src/zapit/src/zapit.cpp index 0dc78c1af..f03ac8421 100644 --- a/src/zapit/src/zapit.cpp +++ b/src/zapit/src/zapit.cpp @@ -242,37 +242,37 @@ void CZapit::LoadSettings() if (!configfile.loadConfig(CONFIGFILE)) WARN("%s not found", CONFIGFILE); - live_channel_id = configfile.getInt64("lastChannel", 0); - lastChannelRadio = configfile.getInt32("lastChannelRadio", 0); - lastChannelTV = configfile.getInt32("lastChannelTV", 0); + live_channel_id = configfile.getInt64("lastChannel", 0); + lastChannelRadio = configfile.getInt32("lastChannelRadio", 0); + lastChannelTV = configfile.getInt32("lastChannelTV", 0); #if 0 //unused - config.fastZap = configfile.getBool("fastZap", 1); - config.sortNames = configfile.getBool("sortNames", 0); - voltageOff = configfile.getBool("voltageOff", 0); + config.fastZap = configfile.getBool("fastZap", 1); + config.sortNames = configfile.getBool("sortNames", 0); + voltageOff = configfile.getBool("voltageOff", 0); #endif - config.saveLastChannel = configfile.getBool("saveLastChannel", true); - config.rezapTimeout = configfile.getInt32("rezapTimeout", 1); - config.feTimeout = configfile.getInt32("feTimeout", 40); - config.scanPids = configfile.getBool("scanPids", 0); - config.highVoltage = configfile.getBool("highVoltage", 0); - config.makeRemainingChannelsBouquet = configfile.getBool("makeRemainingChannelsBouquet", 1); + config.saveLastChannel = configfile.getBool("saveLastChannel", true); + config.rezapTimeout = configfile.getInt32("rezapTimeout", 1); + config.feTimeout = configfile.getInt32("feTimeout", 40); + config.scanPids = configfile.getBool("scanPids", 0); + config.highVoltage = configfile.getBool("highVoltage", 0); + config.makeRemainingChannelsBouquet = configfile.getBool("makeRemainingChannelsBouquet", 1); - config.gotoXXLatitude = strtod(configfile.getString("gotoXXLatitude", "0.0").c_str(), NULL); - config.gotoXXLongitude = strtod(configfile.getString("gotoXXLongitude", "0.0").c_str(), NULL); - config.gotoXXLaDirection = configfile.getInt32("gotoXXLaDirection", 1); - config.gotoXXLoDirection = configfile.getInt32("gotoXXLoDirection", 0); - config.repeatUsals = configfile.getInt32("repeatUsals", 0); + config.gotoXXLatitude = strtod(configfile.getString("gotoXXLatitude", "0.0").c_str(), NULL); + config.gotoXXLongitude = strtod(configfile.getString("gotoXXLongitude", "0.0").c_str(), NULL); + config.gotoXXLaDirection = configfile.getInt32("gotoXXLaDirection", 1); + config.gotoXXLoDirection = configfile.getInt32("gotoXXLoDirection", 0); + config.repeatUsals = configfile.getInt32("repeatUsals", 0); - config.scanSDT = configfile.getInt32("scanSDT", 0); + config.scanSDT = configfile.getInt32("scanSDT", 0); - config.uni_scr = configfile.getInt32("uni_scr", -1); - config.uni_qrg = configfile.getInt32("uni_qrg", 0); + config.uni_scr = configfile.getInt32("uni_scr", -1); + config.uni_qrg = configfile.getInt32("uni_qrg", 0); - cam_ci = configfile.getInt32("cam_ci", 2); + cam_ci = configfile.getInt32("cam_ci", 2); - diseqcType = (diseqc_t)configfile.getInt32("diseqcType", NO_DISEQC); - config.motorRotationSpeed = configfile.getInt32("motorRotationSpeed", 18); // default: 1.8 degrees per second + diseqcType = (diseqc_t)configfile.getInt32("diseqcType", NO_DISEQC); + config.motorRotationSpeed = configfile.getInt32("motorRotationSpeed", 18); // default: 1.8 degrees per second CFrontend::getInstance()->setDiseqcRepeats(configfile.getInt32("diseqcRepeats", 0)); CFrontend::getInstance()->setCurrentSatellitePosition(configfile.getInt32("lastSatellitePosition", 0));