X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/0900d7aeebb22d3d25fc59f6ec44ab1a2702fa99..0e0ed7bf89c65756133a38f52aca9692f61c3f2e:/lib/dvb/frontend.cpp

diff --git a/lib/dvb/frontend.cpp b/lib/dvb/frontend.cpp
index 5fe3799d..5df17931 100644
--- a/lib/dvb/frontend.cpp
+++ b/lib/dvb/frontend.cpp
@@ -192,8 +192,8 @@ void eDVBFrontendParametersCable::set(const CableDeliverySystemDescriptor &descr
 	frequency = descriptor.getFrequency() / 10;
 	symbol_rate = descriptor.getSymbolRate() * 100;
 	fec_inner = descriptor.getFecInner();
-	if ( fec_inner == 0xF )
-		fec_inner = eDVBFrontendParametersCable::FEC_None;
+	if ( fec_inner != eDVBFrontendParametersCable::FEC_None && fec_inner > eDVBFrontendParametersCable::FEC_8_9 )
+		fec_inner = eDVBFrontendParametersCable::FEC_Auto;
 	modulation = descriptor.getModulation();
 	if ( modulation > 0x5 )
 		modulation = eDVBFrontendParametersCable::Modulation_Auto;
@@ -961,14 +961,15 @@ void PutToDict(ePyObject &dict, const char*key, const char *value)
 		eDebug("could not create PyObject for %s", key);
 }
 
-void fillDictWithSatelliteData(ePyObject dict, const FRONTENDPARAMETERS &parm, eDVBFrontend *fe)
+void fillDictWithSatelliteData(ePyObject dict, const FRONTENDPARAMETERS &parm, long freq_offset, int orb_pos, int polarization)
 {
-	long freq_offset=0;
 	long tmp=0;
-	fe->getData(eDVBFrontend::FREQ_OFFSET, freq_offset);
 	int frequency = parm_frequency + freq_offset;
 	PutToDict(dict, "frequency", frequency);
 	PutToDict(dict, "symbol_rate", parm_u_qpsk_symbol_rate);
+	PutToDict(dict, "orbital_position", orb_pos);
+	PutToDict(dict, "polarization", polarization);
+
 	switch(parm_u_qpsk_fec_inner)
 	{
 	case FEC_1_2: tmp = eDVBFrontendParametersSatellite::FEC_1_2; break;
@@ -1224,7 +1225,7 @@ void eDVBFrontend::getTransponderData(ePyObject dest, bool original)
 					switch(m_type)
 					{
 						case feSatellite:
-							fillDictWithSatelliteData(dest, original?parm:front, this);
+							fillDictWithSatelliteData(dest, original?parm:front, m_data[FREQ_OFFSET], m_cur_orbpos, m_cur_pol);
 							break;
 						case feCable:
 							fillDictWithCableData(dest, original?parm:front);
@@ -1750,6 +1751,8 @@ RESULT eDVBFrontend::prepare_sat(const eDVBFrontendParametersSatellite &feparm,
 			feparm.fec,
 			feparm.orbital_position);
 #endif
+		m_cur_pol = feparm.polarisation;
+		m_cur_orbpos = feparm.orbital_position;
 		parm_u_qpsk_symbol_rate = feparm.symbol_rate;
 		switch (feparm.inversion)
 		{