X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/aa5f0da5970746434fe4deea234a98b35857c473..91194b42d0dc174f3e550b9a440e91fccf7e03ec:/lib/dvb/frontend.h

diff --git a/lib/dvb/frontend.h b/lib/dvb/frontend.h
index 2cccf885..1889b971 100644
--- a/lib/dvb/frontend.h
+++ b/lib/dvb/frontend.h
@@ -2,10 +2,6 @@
 #define __dvb_frontend_h
 
 #include <lib/dvb/idvb.h>
-#include <lib/dvb/sec.h>
-
-class eSecCommandList;
-
 class eDVBFrontendParameters: public iDVBFrontendParameters
 {
 	DECLARE_REF(eDVBFrontendParameters);
@@ -20,19 +16,24 @@ public:
 	eDVBFrontendParameters();
 	
 	RESULT getSystem(int &type) const;
-	RESULT getDVBS(eDVBFrontendParametersSatellite &p) const;
-	RESULT getDVBC(eDVBFrontendParametersCable &p) const;
-	RESULT getDVBT(eDVBFrontendParametersTerrestrial &p) const;
+	RESULT getDVBS(eDVBFrontendParametersSatellite &SWIG_OUTPUT) const;
+	RESULT getDVBC(eDVBFrontendParametersCable &SWIG_OUTPUT) const;
+	RESULT getDVBT(eDVBFrontendParametersTerrestrial &SWIG_OUTPUT) const;
 
 	RESULT setDVBS(const eDVBFrontendParametersSatellite &p);
 	RESULT setDVBC(const eDVBFrontendParametersCable &p);
 	RESULT setDVBT(const eDVBFrontendParametersTerrestrial &p);
 	
-	RESULT calculateDifference(const iDVBFrontendParameters *parm, int &diff) const;
+	RESULT calculateDifference(const iDVBFrontendParameters *parm, int &SWIG_OUTPUT) const;
 	
-	RESULT getHash(unsigned long &hash) const;
+	RESULT getHash(unsigned long &SWIG_OUTPUT) const;
 };
 
+#ifndef SWIG
+
+#include <lib/dvb/sec.h>
+class eSecCommandList;
+
 class eDVBFrontend: public iDVBFrontend, public Object
 {
 	DECLARE_REF(eDVBFrontend);
@@ -56,7 +57,7 @@ class eDVBFrontend: public iDVBFrontend, public Object
 
 	eSecCommandList m_sec_sequence;
 
-	int m_data[9]; /* when satellite frontend then
+	int m_data[10]; /* when satellite frontend then
 		data[0] = lastcsw -> state of the committed switch
 		data[1] = lastucsw -> state of the uncommitted switch
 		data[2] = lastToneburst -> current state of toneburst switch
@@ -65,10 +66,12 @@ class eDVBFrontend: public iDVBFrontend, public Object
 		data[5] = curRotorCmd
 		data[6] = curRotorPos
 		data[7] = linkedToTunerNo
-		data[8] = dependsToTunerNo (just satpos.. for rotor with twin lnb) */
+		data[8] = dependsToTunerNo (just satpos.. for rotor with twin lnb)
+		data[9] = previousFrequencyOffset */
 
 	int m_idleInputpower[2];  // 13V .. 18V
 	int m_runningInputpower;
+
 	int m_timeoutCount; // needed for timeout
 	int m_retryCount; // diseqc retry for rotor
 	int m_curVoltage;
@@ -85,6 +88,9 @@ public:
 
 	RESULT getFrontendType(int &type);
 	RESULT tune(const iDVBFrontendParameters &where);
+	RESULT prepare_sat(const eDVBFrontendParametersSatellite &);
+	RESULT prepare_cable(const eDVBFrontendParametersCable &);
+	RESULT prepare_terrestrial(const eDVBFrontendParametersTerrestrial &);
 	RESULT connectStateChange(const Slot1<void,iDVBFrontend*> &stateChange, ePtr<eConnection> &connection);
 	RESULT getState(int &state);
 	RESULT setTone(int tone);
@@ -96,7 +102,9 @@ public:
 	RESULT getData(int num, int &data);
 	RESULT setData(int num, int val);
 
-	int readFrontendData(int type); // bitErrorRate, signalPower, signalQuality
+	int readFrontendData(int type); // bitErrorRate, signalPower, signalQuality, Locked, Synced
+	PyObject *readTransponderData(bool original);
+
 	int isCompatibleWith(ePtr<iDVBFrontendParameters> &feparm);
 	int getID() { return m_fe; }
 
@@ -104,4 +112,5 @@ public:
 	int closeFrontend();
 };
 
+#endif // SWIG
 #endif