X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fdvb%2Fidvb.h;h=8d5d47131a024b2c27f6ae09a0e895dde4404ec2;hp=e56a2c7bb784afd35190e507dae1c22b383f377c;hb=d8e08fe0a7304ed06b3de0b9ad6d4265ec8063b8;hpb=2d7e9486df86b2cf4b4708e61c9d4e392ded1b4d

diff --git a/lib/dvb/idvb.h b/lib/dvb/idvb.h
index e56a2c7..8d5d471 100644
--- a/lib/dvb/idvb.h
+++ b/lib/dvb/idvb.h
@@ -3,14 +3,9 @@
 
 #ifndef SWIG
 
-#if HAVE_DVB_API_VERSION < 3
-#include <ost/frontend.h>
-#define FRONTENDPARAMETERS FrontendParameters
-#else
 #include <linux/dvb/frontend.h>
 #include <linux/dvb/video.h>
 #define FRONTENDPARAMETERS struct dvb_frontend_parameters
-#endif
 #include <lib/dvb/frontendparms.h>
 #include <lib/base/object.h>
 #include <lib/base/ebase.h>
@@ -277,9 +272,9 @@ class eDVBService: public iStaticServiceInformation
 public:
 	enum cacheID
 	{
-		cVPID, cAPID, cTPID, cPCRPID, cAC3PID,
+		cVPID, cMPEGAPID, cTPID, cPCRPID, cAC3PID,
 		cVTYPE, cACHANNEL, cAC3DELAY, cPCMDELAY,
-		cSUBTITLE, cacheMax
+		cSUBTITLE, cAACHEAPID=12, cDDPPID, cAACAPID, cacheMax
 	};
 
 	int getCacheEntry(cacheID);
@@ -427,10 +422,6 @@ public:
 #endif
 	int len;
 	__u8 data[MAX_DISEQC_LENGTH];
-#if HAVE_DVB_API_VERSION < 3
-	int tone;
-	int voltage;
-#endif
 #ifdef SWIG
 public:
 #endif
@@ -451,14 +442,13 @@ public:
 	enum { stateIdle, stateTuning, stateFailed, stateLock, stateLostLock, stateClosed };
 	enum { toneOff, toneOn };
 	enum { voltageOff, voltage13, voltage18, voltage13_5, voltage18_5 };
-	enum { bitErrorRate, signalPower, signalQuality, locked, synced, frontendNumber, signalQualitydB };
+	enum { bitErrorRate, signalPower, signalQuality, locked, synced, frontendNumber, signalQualitydB, isUsbTuner };
 };
 
 SWIG_IGNORE(iDVBFrontend);
 class iDVBFrontend: public iDVBFrontend_ENUMS, public iObject
 {
 public:
-	virtual RESULT getFrontendType(int &SWIG_OUTPUT)=0;
 	virtual RESULT tune(const iDVBFrontendParameters &where)=0;
 	virtual int closeFrontend(bool force = false, bool no_delayed = false)=0;
 	virtual void reopenFrontend()=0;
@@ -492,7 +482,7 @@ class iDVBSatelliteEquipmentControl: public iObject
 {
 public:
 	virtual RESULT prepare(iDVBFrontend &frontend, FRONTENDPARAMETERS &parm, const eDVBFrontendParametersSatellite &sat, int frontend_id, unsigned int timeout)=0;
-	virtual void prepareTurnOffSatCR(iDVBFrontend &frontend, int satcr)=0;
+	virtual void prepareTurnOffSatCR(iDVBFrontend &frontend)=0;
 	virtual int canTune(const eDVBFrontendParametersSatellite &feparm, iDVBFrontend *fe, int frontend_id, int *highest_score_lnb=0)=0;
 	virtual void setRotorMoving(int slotid, bool)=0;
 };
@@ -636,13 +626,10 @@ public:
 	virtual RESULT getSTC(pts_t &pts, int num=0)=0;
 	virtual RESULT getCADemuxID(uint8_t &id)=0;
 	virtual RESULT flush()=0;
+	virtual int openDVR(int flags)=0;
+	virtual int getSource()=0;
 };
 
-#if HAVE_DVB_API_VERSION < 3 && !defined(VIDEO_EVENT_SIZE_CHANGED)
-#define VIDEO_EVENT_SIZE_CHANGED 1
-#define VIDEO_EVENT_FRAME_RATE_CHANGED 2
-#endif
-
 class iTSMPEGDecoder: public iObject
 {
 public:
@@ -690,6 +677,14 @@ public:
 
 		/** Display any complete data as fast as possible */
 	virtual RESULT setTrickmode()=0;
+
+	virtual RESULT prepareFCC(int fe_id, int vpid, int vtype, int pcrpid)=0;
+
+	virtual RESULT fccDecoderStart()=0;
+
+	virtual RESULT fccDecoderStop()=0;
+
+	virtual RESULT fccUpdatePids(int fe_id, int vpid, int vtype, int pcrpid)=0;
 	
 	virtual RESULT getPTS(int what, pts_t &pts) = 0;