X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/f01b61f8a3c92f43132fdc078e5d3ab0b1345c4a..b8f5ce238d6307c1030956c470e550b711493f3c:/lib/dvb/frontend.h

diff --git a/lib/dvb/frontend.h b/lib/dvb/frontend.h
index c28399b4..2c8d89e3 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 setDVBS(const eDVBFrontendParametersSatellite &p, bool no_rotor_command_on_tune=false);
 	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,7 +66,8 @@ 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;
@@ -101,6 +103,8 @@ public:
 	RESULT setData(int num, int val);
 
 	int readFrontendData(int type); // bitErrorRate, signalPower, signalQuality, Locked, Synced
+	PyObject *readTransponderData(bool original);
+
 	int isCompatibleWith(ePtr<iDVBFrontendParameters> &feparm);
 	int getID() { return m_fe; }
 
@@ -108,4 +112,5 @@ public:
 	int closeFrontend();
 };
 
+#endif // SWIG
 #endif