small fix

[enigma2.git] / lib / dvb / idvb.h

diff --git a/lib/dvb/idvb.h b/lib/dvb/idvb.h
index 8b86866e423a3bae8679650688b1b5f795dea3c0..9e78153bc1c57533212d2cacdbffaecfb77efb9d 100644 (file)
--- a/lib/dvb/idvb.h
+++ b/lib/dvb/idvb.h
@@ -8,6 +8,7 @@
 #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>
@@ -18,6 +19,14 @@
 #include <libsig_comp.h>
 #include <connection.h>
 
+#if defined(__GNUC__) && ((__GNUC__ == 3 && __GNUC_MINOR__ >= 1) || __GNUC__ == 4 )  // check if gcc version >= 3.1
+#include <ext/slist>
+#define CAID_LIST __gnu_cxx::slist<uint16_t>
+#else
+#include <slist>
+#define CAID_LIST std::slist<uint16_t>
+#endif
+
 struct eBouquet
 {
        std::string m_bouquet_name;
@@ -26,7 +35,7 @@ struct eBouquet
        list m_services;
 // the following five methods are implemented in db.cpp
        RESULT flushChanges();
-       RESULT addService(const eServiceReference &);
+       RESULT addService(const eServiceReference &, eServiceReference before=eServiceReference());
        RESULT removeService(const eServiceReference &);
        RESULT moveService(const eServiceReference &, unsigned int);
        RESULT setListName(const std::string &name);
@@ -220,10 +229,15 @@ class eDVBChannelQuery;
 class eDVBService: public iStaticServiceInformation
 {
        DECLARE_REF(eDVBService);
+       int *m_cache;
+       void initCache();
+       void copyCache(int *source);
 public:
        enum cacheID
        {
-               cVPID, cAPID, cTPID, cPCRPID, cAC3PID, cVTYPE, cACHANNEL, cacheMax
+               cVPID, cAPID, cTPID, cPCRPID, cAC3PID,
+               cVTYPE, cACHANNEL, cAC3DELAY, cPCMDELAY,
+               cSUBTITLE, cacheMax
        };
 
        int getCacheEntry(cacheID);
@@ -250,9 +264,8 @@ public:
 
        bool usePMT() const { return !(m_flags & dxNoDVB); }
 
-//     std::set<int> m_ca;
+       CAID_LIST m_ca;
 
-       int m_cache[cacheMax];
        virtual ~eDVBService();
        
        eDVBService &operator=(const eDVBService &);
@@ -260,7 +273,8 @@ public:
        // iStaticServiceInformation
        RESULT getName(const eServiceReference &ref, std::string &name);
        RESULT getEvent(const eServiceReference &ref, ePtr<eServiceEvent> &ptr, time_t start_time);
-       bool isPlayable(const eServiceReference &ref, const eServiceReference &ignore);
+       int isPlayable(const eServiceReference &ref, const eServiceReference &ignore);
+       PyObject *getInfoObject(const eServiceReference &ref, int);  // implemented in lib/service/servicedvb.h
 
                /* for filtering: */
        int checkFilter(const eServiceReferenceDVB &ref, const eDVBChannelQuery &query);
@@ -351,7 +365,7 @@ public:
        virtual RESULT getDVBC(eDVBFrontendParametersCable &SWIG_OUTPUT) const = 0;
        virtual RESULT getDVBT(eDVBFrontendParametersTerrestrial &SWIG_OUTPUT) const = 0;
        
-       virtual RESULT calculateDifference(const iDVBFrontendParameters *parm, int &SWIG_OUTPUT) const = 0;
+       virtual RESULT calculateDifference(const iDVBFrontendParameters *parm, int &SWIG_OUTPUT, bool exact) const = 0;
        virtual RESULT getHash(unsigned long &SWIG_OUTPUT) const = 0;
 };
 
@@ -584,6 +598,12 @@ public:
        enum { ac_left, ac_stereo, ac_right };
                /** Set Displayed Audio Channel */
        virtual RESULT setAudioChannel(int channel)=0;
+       virtual int getAudioChannel()=0;
+
+       virtual RESULT setPCMDelay(int delay)=0;
+       virtual int getPCMDelay()=0;
+       virtual RESULT setAC3Delay(int delay)=0;
+       virtual int getAC3Delay()=0;
 
                /** Set Displayed Videotext PID */
        virtual RESULT setTextPID(int vpid)=0;
@@ -624,6 +644,20 @@ public:
        virtual RESULT setTrickmode(int what) = 0;
        
        virtual RESULT getPTS(int what, pts_t &pts) = 0;
+
+       virtual RESULT showSinglePic(const char *filename) = 0;
+
+       virtual RESULT setRadioPic(const std::string &filename) = 0;
+
+       struct videoEvent
+       {
+               enum { eventUnknown = 0, eventSizeChanged = VIDEO_EVENT_SIZE_CHANGED } type;
+               unsigned char aspect;
+               unsigned short height;
+               unsigned short width;
+       };
+
+       virtual RESULT connectVideoEvent(const Slot1<void, struct videoEvent> &event, ePtr<eConnection> &connection) = 0;
 };
 
 #endif //SWIG