X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=lib%2Fdvb%2Fpmt.h;h=3e22174b9d777e7ecfa4ed569f06d626ea8a04f7;hb=4fc2a70eeb86fa51b783b4a9c034b926db0013a3;hp=bd6c4f166f20f3c1082be2c2474f1fb1407c2112;hpb=10e7e45ae92d4fe06f70126ed256b87896dbc432;p=vuplus_dvbapp

diff --git a/lib/dvb/pmt.h b/lib/dvb/pmt.h
index bd6c4f1..3e22174 100644
--- a/lib/dvb/pmt.h
+++ b/lib/dvb/pmt.h
@@ -3,6 +3,7 @@
 
 #ifndef SWIG
 #include <map>
+#include <lib/base/buffer.h>
 #include <lib/dvb/idvb.h>
 #include <lib/dvb/dvb.h>
 #include <lib/dvb/idemux.h>
@@ -35,6 +36,7 @@ typedef std::map<iDVBChannel*, channel_data*> ChannelMap;
 
 class eDVBCAService: public Object
 {
+	eIOBuffer m_buffer;
 	ePtr<eSocketNotifier> m_sn;
 	eServiceReferenceDVB m_service;
 	uint8_t m_used_demux[32];
@@ -44,7 +46,7 @@ class eDVBCAService: public Object
 	struct sockaddr_un m_servaddr;
 	unsigned int m_sendstate;
 	unsigned char m_capmt[2048];
-	eTimer m_retryTimer;
+	ePtr<eTimer> m_retryTimer;
 	void sendCAPMT();
 	void Connect();
 	void socketCB(int what);
@@ -76,7 +78,7 @@ class eDVBServicePMTHandler: public Object
 
 	int m_last_channel_state;
 	eDVBCAService *m_ca_servicePtr;
-	eDVBScan *m_dvb_scan; // for sdt scan
+	ePtr<eDVBScan> m_dvb_scan; // for sdt scan
 
 	eAUTable<eTable<ProgramMapSection> > m_PMT;
 	eAUTable<eTable<ProgramAssociationSection> > m_PAT;
@@ -133,14 +135,14 @@ public:
 	{
 		int pid;
 		int component_tag;
-		enum { vtMPEG2, vtMPEG4_H264 };
+		enum { vtMPEG2, vtMPEG4_H264, vtMPEG1, vtMPEG4_Part2, vtVC1, vtVC1_SM };
 		int type;
 	};
 	
 	struct audioStream
 	{
 		int pid;
-		enum { atMPEG, atAC3, atDTS, atAAC };
+		enum { atMPEG, atAC3, atDTS, atAAC, atAACHE };
 		int type; // mpeg2, ac3, dts, ...
 		
 		int component_tag;