Remove check legacy dvbapi version.

[vuplus_dvbapp] / lib / dvb / idvb.h

diff --git a/lib/dvb/idvb.h b/lib/dvb/idvb.h
index 2c11ff8..8d5d471 100644 (file)
--- 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>
@@ -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,7 +442,7 @@ 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);
@@ -636,13 +627,9 @@ public:
        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;