From a2ed2e8bf55282afc83e4c3e95981c22f30bd0a2 Mon Sep 17 00:00:00 2001 From: "[CST] Focus" Date: Thu, 1 Sep 2011 12:30:24 +0000 Subject: [PATCH] use CZapit class git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1653 e54a6e83-5905-42d5-8d5c-058d10e6a962 Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/8b4ba11adf214b4bb2f35d57e9f0caf98ed60c4e Author: [CST] Focus Date: 2011-09-01 (Thu, 01 Sep 2011) --- src/gui/scan_setup.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/gui/scan_setup.cpp b/src/gui/scan_setup.cpp index e2b1f8109..ff963a583 100644 --- a/src/gui/scan_setup.cpp +++ b/src/gui/scan_setup.cpp @@ -54,6 +54,7 @@ #include #include #include +#include extern int scan_pids; extern CZapitChannel *g_current_channel; @@ -66,9 +67,6 @@ extern int scan_pids; static int all_usals = 1; sat_iterator_t sit; -void setZapitConfig(Zapit_config *Cfg); -void getZapitConfig(Zapit_config *Cfg); - #define SCANTS_BOUQUET_OPTION_COUNT 3 const CMenuOptionChooser::keyval SCANTS_BOUQUET_OPTIONS[SCANTS_BOUQUET_OPTION_COUNT] = { @@ -257,7 +255,7 @@ int CScanSetup::exec(CMenuTarget* parent, const std::string &actionKey) printf("[neutrino] CScanSetup %s: init scan setup (Mode: %d)...\n",__FUNCTION__ , is_wizard); - getZapitConfig(&zapitCfg); + CZapit::getInstance()->GetConfig(zapitCfg); showScanMenu(); return res; @@ -759,11 +757,11 @@ void CScanSetup::saveScanSetup() if(!scansettings.saveSettings(NEUTRINO_SCAN_SETTINGS_FILE)) dprintf(DEBUG_NORMAL, "error while saving scan-settings!\n"); - SaveMotorPositions(); + CServiceManager::getInstance()->SaveMotorPositions(); zapitCfg.gotoXXLatitude = strtod(zapit_lat, NULL); zapitCfg.gotoXXLongitude = strtod(zapit_long, NULL); - setZapitConfig(&zapitCfg); + CZapit::getInstance()->SetConfig(&zapitCfg); }