X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fdvb%2Fsec.cpp;h=d1567bafbd55b83aacfe0af374b0fe0ce97dcf74;hp=08976ef5f36acbffb577e95dccbc6ba70fc6fdce;hb=afa141eedd597d0468d33b97a79f738a9ebfd11f;hpb=7b7a80a1f979b0bd9c68aa33af968db25bf63f81

diff --git a/lib/dvb/sec.cpp b/lib/dvb/sec.cpp
index 08976ef..d1567ba 100644
--- a/lib/dvb/sec.cpp
+++ b/lib/dvb/sec.cpp
@@ -49,11 +49,6 @@ eDVBSatelliteEquipmentControl::eDVBSatelliteEquipmentControl(eSmartPtrList<eDVBR
 		if (!simulate) \
 			eSecDebug(x); \
 	} while(0)
-//		else \
-//		{ \
-//			eDebugNoNewLine("SIMULATE:"); \
-//			eDebug(x); \
-//		} \
 
 int eDVBSatelliteEquipmentControl::canTune(const eDVBFrontendParametersSatellite &sat, iDVBFrontend *fe, int slot_id, int *highest_score_lnb)
 {
@@ -279,11 +274,6 @@ bool need_turn_fast(int turn_speed)
 		if (!simulate) \
 			eDebug(x); \
 	} while(0)
-//		else \
-//		{ \
-//			eDebugNoNewLine("SIMULATE:"); \
-//			eDebug(x); \
-//		} \
 
 RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPARAMETERS &parm, const eDVBFrontendParametersSatellite &sat, int slot_id, unsigned int tunetimeout)
 {
@@ -1166,6 +1156,13 @@ RESULT eDVBSatelliteEquipmentControl::clear()
 		it->m_frontend->setData(eDVBFrontend::ROTOR_POS, -1);
 		it->m_frontend->setData(eDVBFrontend::ROTOR_CMD, -1);
 		it->m_frontend->setData(eDVBFrontend::SATCR, -1);
+
+		if (it->m_frontend->is_FBCTuner())
+		{
+			eFBCTunerManager *fbcmng = eFBCTunerManager::getInstance();
+			if (fbcmng)
+				fbcmng->setDefaultFBCID(*it);
+		}
 	}
 
 	for (eSmartPtrList<eDVBRegisteredFrontend>::iterator it(m_avail_simulate_frontends.begin()); it != m_avail_simulate_frontends.end(); ++it)
@@ -1610,6 +1607,12 @@ RESULT eDVBSatelliteEquipmentControl::setTunerLinked(int tu1, int tu2)
 			char c;
 			p1->m_frontend->setData(eDVBFrontend::LINKED_PREV_PTR, (long)p2);
 			p2->m_frontend->setData(eDVBFrontend::LINKED_NEXT_PTR, (long)p1);
+
+			eFBCTunerManager *fbcmng = eFBCTunerManager::getInstance();
+			if (p1->m_frontend->is_FBCTuner() && fbcmng)
+			{
+				fbcmng->updateFBCID(p1, p2);
+			}
 		}
 
 		p1=p2=NULL;