From: Andreas Monzner <andreas.monzner@multimedia-labs.de>
Date: Wed, 31 Aug 2005 09:40:10 +0000 (+0000)
Subject: lnb's have diseqc parameters.. not satellite's
X-Git-Tag: 2.6.0~5657
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/c692d6151aa59eb1823e131c6f97e51659c87ee8

lnb's have diseqc parameters.. not satellite's
---

diff --git a/lib/dvb/sec.cpp b/lib/dvb/sec.cpp
index 3d0bb90b..71a1e460 100644
--- a/lib/dvb/sec.cpp
+++ b/lib/dvb/sec.cpp
@@ -21,8 +21,8 @@ eDVBSatelliteEquipmentControl::eDVBSatelliteEquipmentControl()
 {
 	m_lnblist.push_back(eDVBSatelliteLNBParameters());
 	eDVBSatelliteLNBParameters &lnb_ref = m_lnblist.front();
+	eDVBSatelliteDiseqcParameters &diseqc_ref = lnb_ref.m_diseqc_parameters;
 	eDVBSatelliteParameters &astra1 = lnb_ref.m_satellites[192];
-	eDVBSatelliteDiseqcParameters &diseqc_ref = astra1.m_diseqc_parameters;
 	eDVBSatelliteSwitchParameters &switch_ref = astra1.m_switch_parameters;
 
 	lnb_ref.m_lof_hi = 10600000;
@@ -48,11 +48,12 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA
 	for (;it != m_lnblist.end(); ++it )
 	{
 		eDVBSatelliteLNBParameters &lnb_param = *it;
+		eDVBSatelliteDiseqcParameters &di_param = lnb_param.m_diseqc_parameters;
 		std::map<int, eDVBSatelliteParameters>::iterator sit =
 			lnb_param.m_satellites.find(sat.orbital_position);
 		if ( sit != lnb_param.m_satellites.end())
 		{
-			eDVBSatelliteDiseqcParameters &di_param = sit->second.m_diseqc_parameters;
+
 			eDVBSatelliteSwitchParameters &sw_param = sit->second.m_switch_parameters;
 			eDVBSatelliteRotorParameters &rotor_param = sit->second.m_rotor_parameters;
 			int hi=0,
diff --git a/lib/dvb/sec.h b/lib/dvb/sec.h
index 2e279900..f03999d8 100644
--- a/lib/dvb/sec.h
+++ b/lib/dvb/sec.h
@@ -171,7 +171,6 @@ public:
 class eDVBSatelliteParameters
 {
 public:
-	eDVBSatelliteDiseqcParameters m_diseqc_parameters;
 	eDVBSatelliteRotorParameters m_rotor_parameters;
 	eDVBSatelliteSwitchParameters m_switch_parameters;
 };
@@ -189,6 +188,7 @@ public:
 	bool m_increased_voltage; // use increased voltage ( 14/18V )
 
 	std::map<int, eDVBSatelliteParameters> m_satellites;
+	eDVBSatelliteDiseqcParameters m_diseqc_parameters;
 };
 
 class eDVBSatelliteEquipmentControl: public iDVBSatelliteEquipmentControl