X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=lib%2Fdvb%2Ffrontend.cpp;h=eba474e8046d031060f643d214c60e9c84fe15f3;hb=3d942915a3aaf28d3c38cc7f94e1cc730f5f60d9;hp=0fd12bece4eeb7249edb6e1b6271a3c0e299e746;hpb=44ae7fe03c0b6f58b502640593ffb2f0cd9b58a7;p=vuplus_dvbapp

diff --git a/lib/dvb/frontend.cpp b/lib/dvb/frontend.cpp
index 0fd12be..eba474e 100644
--- a/lib/dvb/frontend.cpp
+++ b/lib/dvb/frontend.cpp
@@ -53,6 +53,46 @@
 #include <dvbsi++/cable_delivery_system_descriptor.h>
 #include <dvbsi++/terrestrial_delivery_system_descriptor.h>
 
+void eDVBDiseqcCommand::setCommandString(const char *str)
+{
+	if (!str)
+		return;
+	len=0;
+	int slen = strlen(str);
+	if (slen % 2)
+	{
+		eDebug("invalid diseqc command string length (not 2 byte aligned)");
+		return;
+	}
+	if (slen > MAX_DISEQC_LENGTH*2)
+	{
+		eDebug("invalid diseqc command string length (string is to long)");
+		return;
+	}
+	unsigned char val=0;
+	for (int i=0; i < slen; ++i)
+	{
+		unsigned char c = str[i];
+		switch(c)
+		{
+			case '0' ... '9': c-=48; break;
+			case 'a' ... 'f': c-=87; break;
+			case 'A' ... 'F': c-=55; break;
+			default:
+				eDebug("invalid character in hex string..ignore complete diseqc command !");
+				return;
+		}
+		if ( i % 2 )
+		{
+			val |= c;
+			data[i/2] = val;
+		}
+		else
+			val = c << 4;
+	}
+	len = slen/2;
+}
+
 void eDVBFrontendParametersSatellite::set(const SatelliteDeliverySystemDescriptor &descriptor)
 {
 	frequency    = descriptor.getFrequency() * 10;
@@ -157,9 +197,10 @@ RESULT eDVBFrontendParameters::getDVBT(eDVBFrontendParametersTerrestrial &p) con
 	return 0;
 }
 
-RESULT eDVBFrontendParameters::setDVBS(const eDVBFrontendParametersSatellite &p)
+RESULT eDVBFrontendParameters::setDVBS(const eDVBFrontendParametersSatellite &p, bool no_rotor_command_on_tune)
 {
 	sat = p;
+	sat.no_rotor_command_on_tune = no_rotor_command_on_tune;
 	m_type = iDVBFrontend::feSatellite;
 	return 0;
 }
@@ -361,7 +402,6 @@ int eDVBFrontend::openFrontend()
 
 	m_sn = new eSocketNotifier(eApp, m_fd, eSocketNotifier::Read);
 	CONNECT(m_sn->activated, eDVBFrontend::feEvent);
-	m_sn->start();
 
 	return 0;
 }
@@ -1165,6 +1205,8 @@ void eDVBFrontend::tuneLoop()  // called by m_tuneTimer
 void eDVBFrontend::setFrontend()
 {
 	eDebug("setting frontend %d", m_fe);
+	m_sn->start();
+	feEvent(-1);
 	if (ioctl(m_fd, FE_SET_FRONTEND, &parm) == -1)
 	{
 		perror("FE_SET_FRONTEND failed");
@@ -1444,13 +1486,14 @@ RESULT eDVBFrontend::tune(const iDVBFrontendParameters &where)
 {
 	eDebug("(%d)tune", m_fe);
 
+	m_timeout->stop();
+
 	int res=0;
 
 	if (m_type == -1)
 		return -ENODEV;
 
-	feEvent(-1);
-
+	m_sn->stop();
 	m_sec_sequence.clear();
 
 	switch (m_type)
@@ -1473,7 +1516,10 @@ RESULT eDVBFrontend::tune(const iDVBFrontendParameters &where)
 			return -EINVAL;
 		res=prepare_cable(feparm);
 		if (!res)
+		{
+			m_sec_sequence.push_back( eSecCommand(eSecCommand::START_TUNE_TIMEOUT) );
 			m_sec_sequence.push_back( eSecCommand(eSecCommand::SET_FRONTEND) );
+		}
 		break;
 	}
 	case feTerrestrial:
@@ -1486,7 +1532,10 @@ RESULT eDVBFrontend::tune(const iDVBFrontendParameters &where)
 		}
 		res=prepare_terrestrial(feparm);
 		if (!res)
+		{
+			m_sec_sequence.push_back( eSecCommand(eSecCommand::START_TUNE_TIMEOUT) );
 			m_sec_sequence.push_back( eSecCommand(eSecCommand::SET_FRONTEND) );
+		}
 		break;
 	}
 	}
@@ -1494,7 +1543,6 @@ RESULT eDVBFrontend::tune(const iDVBFrontendParameters &where)
 	if (!res)  // prepare ok
 	{
 		m_tuneTimer->start(0,true);
-		m_timeout->stop();
 		m_sec_sequence.current() = m_sec_sequence.begin();
 
 		if (m_state != stateTuning)