store subtitle data in service cache and reenable subtitles on next zap to

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

diff --git a/lib/dvb/idvb.h b/lib/dvb/idvb.h
index 8b86866e423a3bae8679650688b1b5f795dea3c0..1f8aebdaf1aa8b2bbdf2020991d53503d62dc451 100644 (file)
--- a/lib/dvb/idvb.h
+++ b/lib/dvb/idvb.h
@@ -18,6 +18,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 +34,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 +228,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 +263,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 &);
@@ -351,7 +363,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 +596,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 +642,10 @@ 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;
 };
 
 #endif //SWIG