X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/4cdb4528bbff583dc193f24508157e96a0d95c59..7b55dfbd380cb3c207089cc22ce15b18ce181fc7:/lib/dvb/frontend.h

diff --git a/lib/dvb/frontend.h b/lib/dvb/frontend.h
index 8c5b757a..ab8c4479 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, bool exact) 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,16 +57,22 @@ class eDVBFrontend: public iDVBFrontend, public Object
 
 	eSecCommandList m_sec_sequence;
 
-	int m_data[9]; /* 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
-		data[3] = newRotorCmd -> last sent rotor cmd
-		data[4] = newRotorPos -> current Rotor Position
-		data[5] = curRotorCmd
-		data[6] = curRotorPos
-		data[7] = linkedToTunerNo
-		data[8] = dependsToTunerNo (just satpos.. for rotor with twin lnb) */
+	enum {
+		CSW,                  // state of the committed switch
+		UCSW,                 // state of the uncommitted switch
+		TONEBURST,            // current state of toneburst switch
+		NEW_ROTOR_CMD,        // prev sent rotor cmd
+		NEW_ROTOR_POS,        // new rotor position (not validated)
+		ROTOR_CMD,            // completed rotor cmd (finalized)
+		ROTOR_POS,            // current rotor position
+		LINKED_PREV_PTR,      // prev double linked list (for linked FEs)
+		LINKED_NEXT_PTR,      // next double linked list (for linked FEs)
+		SATPOS_DEPENDS_PTR,   // pointer to FE with configured rotor (with twin/quattro lnb)
+		FREQ_OFFSET,          // current frequency offset
+		NUM_DATA_ENTRIES
+	};
+
+	int m_data[NUM_DATA_ENTRIES];
 
 	int m_idleInputpower[2];  // 13V .. 18V
 	int m_runningInputpower;
@@ -100,8 +107,8 @@ public:
 	RESULT getData(int num, int &data);
 	RESULT setData(int num, int val);
 
-	int readFrontendData(int type); // bitErrorRate, signalPower, signalQuality, Locked, Synced
-	PyObject *readTransponderData();
+	int readFrontendData(int type); // bitErrorRate, signalPower, signalQuality, locked, synced
+	PyObject *readTransponderData(bool original);
 
 	int isCompatibleWith(ePtr<iDVBFrontendParameters> &feparm);
 	int getID() { return m_fe; }
@@ -110,4 +117,5 @@ public:
 	int closeFrontend();
 };
 
+#endif // SWIG
 #endif