return 0;
}
-void PutToDict(PyObject *dict, const char*key, long value)
+void PutToDict(ePyObject &dict, const char*key, long value)
{
- PyObject *item = PyInt_FromLong(value);
+ ePyObject item = PyInt_FromLong(value);
if (item)
{
if (PyDict_SetItemString(dict, key, item))
eDebug("could not create PyObject for %s", key);
}
-void PutToDict(PyObject *dict, const char*key, const char *value)
+void PutToDict(ePyObject &dict, const char*key, const char *value)
{
- PyObject *item = PyString_FromString(value);
+ ePyObject item = PyString_FromString(value);
if (item)
{
if (PyDict_SetItemString(dict, key, item))
eDebug("could not create PyObject for %s", key);
}
-void fillDictWithSatelliteData(PyObject *dict, const FRONTENDPARAMETERS &parm, eDVBFrontend *fe)
+void fillDictWithSatelliteData(ePyObject dict, const FRONTENDPARAMETERS &parm, eDVBFrontend *fe)
{
int freq_offset=0;
int csw=0;
PutToDict(dict, "system", tmp);
}
-void fillDictWithCableData(PyObject *dict, const FRONTENDPARAMETERS &parm)
+void fillDictWithCableData(ePyObject dict, const FRONTENDPARAMETERS &parm)
{
const char *tmp=0;
PutToDict(dict, "frequency", parm_frequency/1000);
PutToDict(dict, "modulation", tmp);
}
-void fillDictWithTerrestrialData(PyObject *dict, const FRONTENDPARAMETERS &parm)
+void fillDictWithTerrestrialData(ePyObject dict, const FRONTENDPARAMETERS &parm)
{
const char *tmp=0;
PutToDict(dict, "frequency", parm_frequency);
PyObject *eDVBFrontend::readTransponderData(bool original)
{
- PyObject *ret=PyDict_New();
+ ePyObject ret=PyDict_New();
if (ret)
{
parm_u_qam_fec_inner = FEC_AUTO;
break;
}
+ eDebug("tuning to %d khz, sr %d, fec %d, modulation %d, inversion %d",
+ parm_frequency/1000,
+ parm_u_qam_symbol_rate,
+ parm_u_qam_fec_inner,
+ parm_u_qam_modulation,
+ parm_inversion);
return 0;
}
std::string enable_5V;
char configStr[255];
- snprintf(configStr, 255, "config.Nim%c.terrestrial_5V", 'A'+m_fe);
+ snprintf(configStr, 255, "config.Nims.%d.terrestrial_5V", m_fe);
m_sec_sequence.push_back( eSecCommand(eSecCommand::START_TUNE_TIMEOUT) );
ePythonConfigQuery::getConfigValue(configStr, enable_5V);
- if (enable_5V == "on")
+ if (enable_5V == "True")
m_sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, iDVBFrontend::voltage13) );
else
m_sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, iDVBFrontend::voltageOff) );
ASSERT(!feparm->getDVBS(sat_parm));
return m_sec->canTune(sat_parm, this, 1 << m_fe);
}
+ else if (m_type == eDVBFrontend::feCable)
+ return 2; // more prio for cable frontends
return 1;
}