X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/ff84dc4ee5f57e24a0777930d5482ee4ff53da0e..68b90d5fc4598225d38579634686a3a16083fa69:/lib/dvb/frontend.cpp

diff --git a/lib/dvb/frontend.cpp b/lib/dvb/frontend.cpp
index 37ce13a6..79b56e1e 100644
--- a/lib/dvb/frontend.cpp
+++ b/lib/dvb/frontend.cpp
@@ -131,21 +131,21 @@ RESULT eDVBFrontendParameters::getDVBT(eDVBFrontendParametersTerrestrial &p) con
 	return 0;
 }
 
-RESULT eDVBFrontendParameters::setDVBS(eDVBFrontendParametersSatellite &p)
+RESULT eDVBFrontendParameters::setDVBS(const eDVBFrontendParametersSatellite &p)
 {
 	sat = p;
 	m_type = iDVBFrontend::feSatellite;
 	return 0;
 }
 
-RESULT eDVBFrontendParameters::setDVBC(eDVBFrontendParametersCable &p)
+RESULT eDVBFrontendParameters::setDVBC(const eDVBFrontendParametersCable &p)
 {
 	cable = p;
 	m_type = iDVBFrontend::feCable;
 	return 0;
 }
 
-RESULT eDVBFrontendParameters::setDVBT(eDVBFrontendParametersTerrestrial &p)
+RESULT eDVBFrontendParameters::setDVBT(const eDVBFrontendParametersTerrestrial &p)
 {
 	terrestrial = p;
 	m_type = iDVBFrontend::feTerrestrial;
@@ -208,7 +208,7 @@ RESULT eDVBFrontendParameters::getHash(unsigned long &hash) const
 
 DEFINE_REF(eDVBFrontend);
 
-eDVBFrontend::eDVBFrontend(int adap, int fe, int &ok): m_type(-1), m_curVoltage(-1)
+eDVBFrontend::eDVBFrontend(int adap, int fe, int &ok): m_type(-1), m_fe(fe), m_curVoltage(-1)
 {
 #if HAVE_DVB_API_VERSION < 3
 	char sec_filename[128];
@@ -341,7 +341,12 @@ void eDVBFrontend::feEvent(int w)
 			if (m_tuning)
 				state = stateTuning;
 			else
-				state = stateFailed;
+			{
+				state = stateLostLock;
+
+				if (m_state != stateLostLock)
+					eDebug("FIXME: we lost lock, so we might have to retune.");
+			}
 		}
 		if (m_state != state)
 		{
@@ -363,6 +368,7 @@ void eDVBFrontend::timeout()
 			m_state = state;
 			m_stateChanged(this);
 		}
+		m_tuning = 0;
 	} else
 		m_tuning = 0;
 }
@@ -610,8 +616,6 @@ RESULT eDVBFrontend::tune(const iDVBFrontendParameters &where)
 
 	m_sec_sequence.clear();
 
-	eDebug("eDVBFrontend::tune. type: %d", m_type);
-
 	switch (m_type)
 	{
 	case feSatellite:
@@ -904,3 +908,7 @@ RESULT eDVBFrontend::setData(int num, int val)
 	return -EINVAL;
 }
 
+int eDVBFrontend::isCompatibleWith(const eDVBChannelID &chid)
+{
+	return 1;
+}