X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/c31218a50b890d768c6b276a702cb9c22f89fb70..a9939e31b86e340d93aad3d6eb450352ca8323d7:/lib/dvb/idvb.h

diff --git a/lib/dvb/idvb.h b/lib/dvb/idvb.h
index a951fdc4..11bbbf8e 100644
--- a/lib/dvb/idvb.h
+++ b/lib/dvb/idvb.h
@@ -297,13 +297,14 @@ public:
 	enum
 	{
 		dxNoSDT=1,    // don't get SDT
-//nyi	dxDontshow=2,
+		dxDontshow=2,
 		dxNoDVB=4,  // dont use PMT for this service ( use cached pids )
 		dxHoldName=8,
 		dxNewFound=64,
 	};
 
 	bool usePMT() const { return !(m_flags & dxNoDVB); }
+	bool isHidden() const { return m_flags & dxDontshow; }
 
 	CAID_LIST m_ca;
 
@@ -408,7 +409,9 @@ public:
 	
 	virtual RESULT calculateDifference(const iDVBFrontendParameters *parm, int &SWIG_OUTPUT, bool exact) const = 0;
 	virtual RESULT getHash(unsigned long &SWIG_OUTPUT) const = 0;
+	virtual RESULT calcLockTimeout(unsigned int &) const = 0;
 };
+SWIG_TEMPLATE_TYPEDEF(ePtr<iDVBFrontendParameters>, iDVBFrontendParametersPtr);
 
 #define MAX_DISEQC_LENGTH  16
 
@@ -443,7 +446,7 @@ public:
 	enum { stateIdle, stateTuning, stateFailed, stateLock, stateLostLock };
 	enum { toneOff, toneOn };
 	enum { voltageOff, voltage13, voltage18, voltage13_5, voltage18_5 };
-	enum { bitErrorRate, signalPower, signalQuality, locked, synced, frontendNumber };
+	enum { bitErrorRate, signalPower, signalQuality, locked, synced, frontendNumber, signalQualitydB };
 };
 
 SWIG_IGNORE(iDVBFrontend);
@@ -469,8 +472,8 @@ public:
 	virtual void getTransponderData(SWIG_PYOBJECT(ePyObject) dest, bool original)=0;
 	virtual void getFrontendData(SWIG_PYOBJECT(ePyObject) dest)=0;
 #ifndef SWIG
-	virtual RESULT getData(int num, int &data)=0;
-	virtual RESULT setData(int num, int val)=0;
+	virtual RESULT getData(int num, long &data)=0;
+	virtual RESULT setData(int num, long val)=0;
 		/* 0 means: not compatible. other values are a priority. */
 	virtual int isCompatibleWith(ePtr<iDVBFrontendParameters> &feparm)=0;
 #endif
@@ -481,7 +484,7 @@ SWIG_TEMPLATE_TYPEDEF(ePtr<iDVBFrontend>, iDVBFrontendPtr);
 class iDVBSatelliteEquipmentControl: public iObject
 {
 public:
-	virtual RESULT prepare(iDVBFrontend &frontend, FRONTENDPARAMETERS &parm, const eDVBFrontendParametersSatellite &sat, int frontend_id)=0;
+	virtual RESULT prepare(iDVBFrontend &frontend, FRONTENDPARAMETERS &parm, const eDVBFrontendParametersSatellite &sat, int frontend_id, unsigned int timeout)=0;
 	virtual int canTune(const eDVBFrontendParametersSatellite &feparm, iDVBFrontend *fe, int frontend_id)=0;
 	virtual void setRotorMoving(bool)=0;
 };
@@ -509,7 +512,7 @@ public:
 		state_last_instance, /* just one reference to this channel is left */
 		state_release      /* channel is being shut down. */
 	};
-	virtual RESULT getState(int &SWIG_OUTPUT)=0;
+	virtual RESULT getState(int &)=0;
 
 	virtual RESULT getCurrentFrontendParameters(ePtr<iDVBFrontendParameters> &)=0;
 	enum 
@@ -564,7 +567,7 @@ public:
 	void setDecodingDemux(iDVBDemux *demux, iTSMPEGDecoder *decoder);
 	
 			/* frontend and backend */
-	eSingleLock m_lock;
+	eRdWrLock m_lock;
 	
 			/* backend */
 	enum { evtSeek, evtSkipmode, evtSpanChanged };
@@ -655,35 +658,37 @@ public:
 		/** Set Sync mode to either audio or video master */
 	virtual RESULT setSyncMaster(int who)=0;
 
-		/** Apply settings */
+		/** Apply settings with starting video */
 	virtual RESULT start()=0;
-	
+		/** Apply settings but don't start yet */
+	virtual RESULT preroll()=0;
+
 		/** Freeze frame. Either continue decoding (without display) or halt. */
 	virtual RESULT freeze(int cont)=0;
 		/** Continue after freeze. */
 	virtual RESULT unfreeze()=0;
-	
+
 		/** fast forward by skipping frames. 0 is disabled, 2 is twice-the-speed, ... */
 	virtual RESULT setFastForward(int skip=0)=0;
-	
+
 		// stop on .. Picture
 	enum { spm_I, spm_Ref, spm_Any };
 		/** Stop on specific decoded picture. For I-Frame display. */
 	virtual RESULT setSinglePictureMode(int when)=0;
-	
+
 	enum { pkm_B, pkm_PB };
 		/** Fast forward by skipping either B or P/B pictures */
 	virtual RESULT setPictureSkipMode(int what)=0;
-	
+
 		/** Slow Motion by repeating pictures */
 	virtual RESULT setSlowMotion(int repeat)=0;
 	
 	enum { zoom_Normal, zoom_PanScan, zoom_Letterbox, zoom_Fullscreen };
 		/** Set Zoom. mode *must* be fitting. */
 	virtual RESULT setZoom(int what)=0;
-	
+
 	virtual RESULT setTrickmode(int what) = 0;
-	
+
 	virtual RESULT getPTS(int what, pts_t &pts) = 0;
 
 	virtual RESULT showSinglePic(const char *filename) = 0;