X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fdvb%2Ffrontend.cpp;h=bd8f002876d45880bf3b660a9cf7dc398c77b094;hp=8216eea0761840001d668eec379c82a9d05ad586;hb=c95ebd0688c39d4fa6e22e85d84fe7d80e3da013;hpb=a302e0a778e1ea30b76956fd7469cf554eb0fc20

diff --git a/lib/dvb/frontend.cpp b/lib/dvb/frontend.cpp
index 8216eea..bd8f002 100644
--- a/lib/dvb/frontend.cpp
+++ b/lib/dvb/frontend.cpp
@@ -485,7 +485,7 @@ eDVBFrontend::eDVBFrontend(int adap, int fe, int &ok, bool simulate)
 
 void eDVBFrontend::reopenFrontend()
 {
-	closeFrontend();
+	sleep(1);
 	m_type = -1;
 	openFrontend();
 }
@@ -582,7 +582,7 @@ int eDVBFrontend::openFrontend()
 	return 0;
 }
 
-int eDVBFrontend::closeFrontend(bool force)
+int eDVBFrontend::closeFrontend(bool force, bool no_delayed)
 {
 	if (!force && m_data[CUR_VOLTAGE] != -1 && m_data[CUR_VOLTAGE] != iDVBFrontend::voltageOff)
 	{
@@ -605,11 +605,34 @@ int eDVBFrontend::closeFrontend(bool force)
 		eDebugNoSimulate("close frontend %d", m_dvbid);
 		if (m_data[SATCR] != -1)
 		{
-			turnOffSatCR(m_data[SATCR]);
+			if (!no_delayed)
+			{
+				m_sec->prepareTurnOffSatCR(*this, m_data[SATCR]);
+				m_tuneTimer->start(0, true);
+				if(!m_tuneTimer->isActive())
+				{
+					int timeout=0;
+					eDebug("[turnOffSatCR] no mainloop");
+					while(true)
+					{
+						timeout = tuneLoopInt();
+						if (timeout == -1)
+							break;
+						usleep(timeout*1000); // blockierendes wait.. eTimer gibts ja nicht mehr
+					}
+				}
+				else
+					eDebug("[turnOffSatCR] running mainloop");
+				return 0;
+			}
+			else
+				m_data[ROTOR_CMD] = -1;
 		}
+
 		setTone(iDVBFrontend::toneOff);
 		setVoltage(iDVBFrontend::voltageOff);
 		m_tuneTimer->stop();
+
 		if (m_sec && !m_simulate)
 			m_sec->setRotorMoving(m_slotid, false);
 		if (!::close(m_fd))
@@ -1486,9 +1509,14 @@ bool eDVBFrontend::setSecSequencePos(int steps)
 	return true;
 }
 
-void eDVBFrontend::tuneLoop()  // called by m_tuneTimer
+void eDVBFrontend::tuneLoop()
+{
+	tuneLoopInt();
+}
+
+int eDVBFrontend::tuneLoopInt()  // called by m_tuneTimer
 {
-	int delay=0;
+	int delay=-1;
 	eDVBFrontend *sec_fe = this;
 	eDVBRegisteredFrontend *regFE = 0;
 	long tmp = m_data[LINKED_PREV_PTR];
@@ -1518,6 +1546,7 @@ void eDVBFrontend::tuneLoop()  // called by m_tuneTimer
 	{
 		long *sec_fe_data = sec_fe->m_data;
 //		eDebugNoSimulate("tuneLoop %d\n", m_sec_sequence.current()->cmd);
+		delay = 0;
 		switch (m_sec_sequence.current()->cmd)
 		{
 			case eSecCommand::SLEEP:
@@ -1844,6 +1873,13 @@ void eDVBFrontend::tuneLoop()  // called by m_tuneTimer
 				++m_sec_sequence.current();
 				break;
 			}
+			case eSecCommand::DELAYED_CLOSE_FRONTEND:
+			{
+				eDebugNoSimulate("[SEC] delayed close frontend");
+				closeFrontend(false, true);
+				++m_sec_sequence.current();
+				break;
+			}
 			default:
 				eDebugNoSimulate("[SEC] unhandled sec command %d",
 					++m_sec_sequence.current()->cmd);
@@ -1856,6 +1892,7 @@ void eDVBFrontend::tuneLoop()  // called by m_tuneTimer
 		regFE->dec_use();
 	if (m_simulate && m_sec_sequence.current() != m_sec_sequence.end())
 		tuneLoop();
+	return delay;
 }
 
 void eDVBFrontend::setFrontend(bool recvEvents)
@@ -2591,9 +2628,12 @@ RESULT eDVBFrontend::setSEC(iDVBSatelliteEquipmentControl *sec)
 	return 0;
 }
 
-RESULT eDVBFrontend::setSecSequence(const eSecCommandList &list)
+RESULT eDVBFrontend::setSecSequence(eSecCommandList &list)
 {
-	m_sec_sequence = list;
+	if (m_data[SATCR] != -1 && m_sec_sequence.current() != m_sec_sequence.end())
+		m_sec_sequence.push_back(list);
+	else
+		m_sec_sequence = list;
 	return 0;
 }
 
@@ -2670,42 +2710,3 @@ arg_error:
 		"eDVBFrontend::setSlotInfo must get a tuple with first param slotid, second param slot description and third param enabled boolean");
 	return false;
 }
-
-RESULT eDVBFrontend::turnOffSatCR(int satcr)
-{
-	eSecCommandList sec_sequence;
-	// check if voltage is disabled
-	eSecCommand::pair compare;
-	compare.steps = +9;	//nothing to do
-	compare.voltage = iDVBFrontend::voltageOff;
-	sec_sequence.push_back( eSecCommand(eSecCommand::IF_NOT_VOLTAGE_GOTO, compare) );
-	sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, iDVBFrontend::voltage13) );
-	sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 50 ) );
-
-	sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, iDVBFrontend::voltage18_5) );
-	sec_sequence.push_back( eSecCommand(eSecCommand::SET_TONE, iDVBFrontend::toneOff) );
-	sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 250) );
-
-	eDVBDiseqcCommand diseqc;
-	memset(diseqc.data, 0, MAX_DISEQC_LENGTH);
-	diseqc.len = 5;
-	diseqc.data[0] = 0xE0;
-	diseqc.data[1] = 0x10;
-	diseqc.data[2] = 0x5A;
-	diseqc.data[3] = satcr << 5;
-	diseqc.data[4] = 0x00;
-
-	sec_sequence.push_back( eSecCommand(eSecCommand::SEND_DISEQC, diseqc) );
-	sec_sequence.push_back( eSecCommand(eSecCommand::SLEEP, 50+20+14*diseqc.len) );
-	sec_sequence.push_back( eSecCommand(eSecCommand::SET_VOLTAGE, iDVBFrontend::voltage13) );
-	setSecSequence(sec_sequence);
-	return 0;
-}
-
-RESULT eDVBFrontend::ScanSatCR()
-{
-	setFrontend();
-	usleep(20000);
-	setTone(iDVBFrontend::toneOff);
-	return 0;
-}