mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-01 09:51:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

zapit/src/femanager.cpp: change frontend init:

Browse Source 
dont call setDiseqcType direct, setMode will call Init() or setMasterSlave();
force Init() on frontend re-open (leaving standby)
This commit is contained in:
[CST] Focus
2012-10-11 18:41:59 +04:00
parent 21ffa39a45
commit 4758457e49
1 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/zapit/src/femanager.cpp
View File

@@ -170,8 +170,7 @@ bool CFEManager::loadSettings()
frontend_config_t & fe_config = fe->getConfig(); frontend_config_t & fe_config = fe->getConfig();
INFO("load config for fe%d", fe->fenumber); INFO("load config for fe%d", fe->fenumber);
//fe_config.diseqcType = (diseqc_t) getConfigValue(fe, "diseqcType", NO_DISEQC); fe_config.diseqcType = (diseqc_t) getConfigValue(fe, "diseqcType", NO_DISEQC);
diseqc_t diseqcType = (diseqc_t) getConfigValue(fe, "diseqcType", NO_DISEQC);
fe_config.diseqcRepeats = getConfigValue(fe, "diseqcRepeats", 0); fe_config.diseqcRepeats = getConfigValue(fe, "diseqcRepeats", 0);
fe_config.motorRotationSpeed = getConfigValue(fe, "motorRotationSpeed", 18); fe_config.motorRotationSpeed = getConfigValue(fe, "motorRotationSpeed", 18);
fe_config.highVoltage = getConfigValue(fe, "highVoltage", 0); fe_config.highVoltage = getConfigValue(fe, "highVoltage", 0);
@@ -181,7 +180,10 @@ bool CFEManager::loadSettings()
fe->setRotorSatellitePosition(getConfigValue(fe, "lastSatellitePosition", 0)); fe->setRotorSatellitePosition(getConfigValue(fe, "lastSatellitePosition", 0));
//fe->setDiseqcType((diseqc_t) fe_config.diseqcType); //fe->setDiseqcType((diseqc_t) fe_config.diseqcType);
#if 0
diseqc_t diseqcType = (diseqc_t) getConfigValue(fe, "diseqcType", NO_DISEQC);
fe->setDiseqcType(diseqcType); fe->setDiseqcType(diseqcType);
#endif
char cfg_key[81]; char cfg_key[81];
sprintf(cfg_key, "fe%d_satellites", fe->fenumber); sprintf(cfg_key, "fe%d_satellites", fe->fenumber);
@@ -265,27 +267,29 @@ void CFEManager::saveSettings(bool write)
void CFEManager::setMode(fe_mode_t newmode, bool initial) void CFEManager::setMode(fe_mode_t newmode, bool initial)
{ {
if(newmode == mode) if(!initial && (newmode == mode))
return; return;
if(femap.size() == 1) {
mode = FE_MODE_SINGLE;
return;
}
mode = newmode; mode = newmode;
bool setslave = (mode == FE_MODE_LOOP); if(femap.size() == 1)
mode = FE_MODE_SINGLE;
bool setslave = (mode == FE_MODE_LOOP) || (mode == FE_MODE_SINGLE);
for(fe_map_iterator_t it = femap.begin(); it != femap.end(); it++) { for(fe_map_iterator_t it = femap.begin(); it != femap.end(); it++) {
CFrontend * fe = it->second;
if(it != femap.begin()) { if(it != femap.begin()) {
CFrontend * fe = it->second;
INFO("Frontend %d as slave: %s", fe->fenumber, setslave ? "yes" : "no"); INFO("Frontend %d as slave: %s", fe->fenumber, setslave ? "yes" : "no");
fe->setMasterSlave(setslave); fe->setMasterSlave(setslave);
} } else
fe->Init();
} }
#if 0
if(setslave && !initial) { if(setslave && !initial) {
CFrontend * fe = getFE(0); CFrontend * fe = getFE(0);
fe->Close(); fe->Close();
fe->Open(); fe->Open(true);
} }
#endif
} }
void CFEManager::Open() void CFEManager::Open()
@@ -293,7 +297,7 @@ void CFEManager::Open()
for(fe_map_iterator_t it = femap.begin(); it != femap.end(); it++) { for(fe_map_iterator_t it = femap.begin(); it != femap.end(); it++) {
CFrontend * fe = it->second; CFrontend * fe = it->second;
if(!fe->Locked()) if(!fe->Locked())
fe->Open(); fe->Open(true);
} }
} }