mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-28 07:51:11 +02:00
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: 8b4ba11adf
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2011-09-01 (Thu, 01 Sep 2011)
This commit is contained in:
@@ -54,6 +54,7 @@
|
|||||||
#include <zapit/getservices.h>
|
#include <zapit/getservices.h>
|
||||||
#include <zapit/satconfig.h>
|
#include <zapit/satconfig.h>
|
||||||
#include <zapit/fastscan.h>
|
#include <zapit/fastscan.h>
|
||||||
|
#include <zapit/zapit.h>
|
||||||
|
|
||||||
extern int scan_pids;
|
extern int scan_pids;
|
||||||
extern CZapitChannel *g_current_channel;
|
extern CZapitChannel *g_current_channel;
|
||||||
@@ -66,9 +67,6 @@ extern int scan_pids;
|
|||||||
static int all_usals = 1;
|
static int all_usals = 1;
|
||||||
sat_iterator_t sit;
|
sat_iterator_t sit;
|
||||||
|
|
||||||
void setZapitConfig(Zapit_config *Cfg);
|
|
||||||
void getZapitConfig(Zapit_config *Cfg);
|
|
||||||
|
|
||||||
#define SCANTS_BOUQUET_OPTION_COUNT 3
|
#define SCANTS_BOUQUET_OPTION_COUNT 3
|
||||||
const CMenuOptionChooser::keyval SCANTS_BOUQUET_OPTIONS[SCANTS_BOUQUET_OPTION_COUNT] =
|
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);
|
printf("[neutrino] CScanSetup %s: init scan setup (Mode: %d)...\n",__FUNCTION__ , is_wizard);
|
||||||
getZapitConfig(&zapitCfg);
|
CZapit::getInstance()->GetConfig(zapitCfg);
|
||||||
showScanMenu();
|
showScanMenu();
|
||||||
|
|
||||||
return res;
|
return res;
|
||||||
@@ -759,11 +757,11 @@ void CScanSetup::saveScanSetup()
|
|||||||
if(!scansettings.saveSettings(NEUTRINO_SCAN_SETTINGS_FILE))
|
if(!scansettings.saveSettings(NEUTRINO_SCAN_SETTINGS_FILE))
|
||||||
dprintf(DEBUG_NORMAL, "error while saving scan-settings!\n");
|
dprintf(DEBUG_NORMAL, "error while saving scan-settings!\n");
|
||||||
|
|
||||||
SaveMotorPositions();
|
CServiceManager::getInstance()->SaveMotorPositions();
|
||||||
zapitCfg.gotoXXLatitude = strtod(zapit_lat, NULL);
|
zapitCfg.gotoXXLatitude = strtod(zapit_lat, NULL);
|
||||||
zapitCfg.gotoXXLongitude = strtod(zapit_long, NULL);
|
zapitCfg.gotoXXLongitude = strtod(zapit_long, NULL);
|
||||||
|
|
||||||
setZapitConfig(&zapitCfg);
|
CZapit::getInstance()->SetConfig(&zapitCfg);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user