[unicable] incorrect behavior of linked tuners fixed

openatv · Feb 7, 2017 · badcf21 · badcf21
1 parent 06c45a5
commit badcf21
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/lib/dvb/frontend.cpp b/lib/dvb/frontend.cpp
@@ -2927,13 +2927,14 @@ RESULT eDVBFrontend::tune(const iDVBFrontendParameters &where)
 		if(has_prev())
 		{
 			eDVBFrontend *fe = (eDVBFrontend *)this;
-			fe->getTop(this, fe);
+			getTop(this, fe);
 
 			int state;
 			fe->getState(state);
 			if (state != eDVBFrontend::stateClosed)
 			{
 				eSecCommandList sec_takeover_sequence;
+				sec_takeover_sequence.push_front(eSecCommand(eSecCommand::CHANGE_TUNER_TYPE, m_type));
 				sec_takeover_sequence.push_front(eSecCommand(eSecCommand::TAKEOVER, (long)this));
 				fe->setSecSequence(sec_takeover_sequence, (eDVBFrontend *)this);
 				eDebug("takeover_sec %d",fe->getDVBID());

diff --git a/lib/dvb/sec.cpp b/lib/dvb/sec.cpp
@@ -534,7 +534,7 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, const eDVB
 				{
 					case 1:
 						eDebugNoSimulate("JESS (EN50607)");
-						if(gfrq)
+						if(lnb_param.SatCR_switch_reliable)
 						{
 							long inv;
 							frontend.getData(eDVBFrontend::SPECTINV_CNT, inv);
@@ -547,7 +547,7 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, const eDVB
 					case 0:
 					default:
 						eDebugNoSimulate("Unicable (EN50494)");
-						if(gfrq)
+						if(lnb_param.SatCR_switch_reliable)
 						{
 							long inv;
 							frontend.getData(eDVBFrontend::SPECTINV_CNT, inv);
@@ -1262,6 +1262,7 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, const eDVB
 				if (state != eDVBFrontend::stateClosed)
 				{
 					eSecCommandList sec_takeover_sequence;
+					sec_takeover_sequence.push_front(eSecCommand(eSecCommand::CHANGE_TUNER_TYPE,((eDVBFrontend *)&frontend)->getCurrentType()));
 					sec_takeover_sequence.push_front(eSecCommand(eSecCommand::TAKEOVER, (long)&frontend));
 					fe->setSecSequence(sec_takeover_sequence, (eDVBFrontend *)&frontend);
 					eDebugNoSimulate("takeover_sec %d",fe->getDVBID());
@@ -1367,6 +1368,7 @@ void eDVBSatelliteEquipmentControl::prepareTurnOffSatCR(iDVBFrontend &frontend)
 		if (state != eDVBFrontend::stateClosed)
 		{
 			eSecCommandList sec_takeover_sequence;
+			sec_takeover_sequence.push_front(eSecCommand(eSecCommand::CHANGE_TUNER_TYPE,((eDVBFrontend *)&frontend)->getCurrentType()));
 			sec_takeover_sequence.push_front(eSecCommand(eSecCommand::TAKEOVER, (long)&frontend));
 			fe->setSecSequence(sec_takeover_sequence, (eDVBFrontend *)&frontend);
 			eDebug("takeover_sec %d",fe->getDVBID());