X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/4e8cae716ad3fdf29a7b2a45e5eec0a530f93277..f990151461bd800976ffc1382b674a537b8f1a3a:/lib/dvb/idvb.h

diff --git a/lib/dvb/idvb.h b/lib/dvb/idvb.h
index dff543ca..997b2a88 100644
--- 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 &);
@@ -260,7 +272,7 @@ 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);
 
 		/* for filtering: */
 	int checkFilter(const eServiceReferenceDVB &ref, const eDVBChannelQuery &query);
@@ -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;
 };
 
@@ -411,7 +423,7 @@ public:
 	virtual RESULT setSecSequence(const eSecCommandList &list)=0;
 #endif
 	enum {
-		bitErrorRate, signalPower, signalQuality, Locked, Synced
+		bitErrorRate, signalPower, signalQuality, locked, synced, frontendNumber
 	};
 	virtual int readFrontendData(int type)=0;
 	virtual PyObject *readTransponderData(bool original)=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