X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/1f3788c5e1a47fa9b0412902acba38c86b53bb63..36dc37e5d0c9ef8fc5f923ad38ee6cc98f316556:/lib/dvb/idvb.h

diff --git a/lib/dvb/idvb.h b/lib/dvb/idvb.h
index ecf8bb92..8bbbaafa 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;
@@ -220,14 +228,17 @@ 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, cacheMax
+		cVPID, cAPID, cTPID, cPCRPID, cAC3PID, cVTYPE, cACHANNEL, cacheMax
 	};
 
-	int getCachePID(cacheID);
-	void setCachePID(cacheID, int);
+	int getCacheEntry(cacheID);
+	void setCacheEntry(cacheID, int);
 
 	bool cacheEmpty();
 
@@ -250,9 +261,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 &);
@@ -411,7 +421,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;
@@ -577,10 +587,14 @@ public:
 		/** Set Displayed Video PID and type */
 	virtual RESULT setVideoPID(int vpid, int type)=0;
 
-	enum { af_MPEG, af_AC3, af_DTS };
+	enum { af_MPEG, af_AC3, af_DTS, af_AAC };
 		/** Set Displayed Audio PID and type */
 	virtual RESULT setAudioPID(int apid, int type)=0;
 
+	enum { ac_left, ac_stereo, ac_right };
+		/** Set Displayed Audio Channel */
+	virtual RESULT setAudioChannel(int channel)=0;
+
 		/** Set Displayed Videotext PID */
 	virtual RESULT setTextPID(int vpid)=0;