X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/9a262588610fbdf0c7e8ad1c6fa393adcbc35399..d34456e1eb1869b92e221e9b18be04efff3a804c:/lib/dvb/pmt.h

diff --git a/lib/dvb/pmt.h b/lib/dvb/pmt.h
index d1e28703..eae05bb1 100644
--- a/lib/dvb/pmt.h
+++ b/lib/dvb/pmt.h
@@ -20,10 +20,22 @@
 class eDVBCAService;
 class eDVBScan;
 
+struct channel_data: public Object
+{
+	ePtr<eDVBChannel> m_channel;
+	ePtr<eConnection> m_stateChangedConn;
+	int m_prevChannelState;
+	int m_dataDemux;
+};
+
+// TODO .. put all static stuff into a 'eDVBCAServiceHandler class'
+
 typedef std::map<eServiceReferenceDVB, eDVBCAService*> CAServiceMap;
+typedef std::map<iDVBChannel*, channel_data*> ChannelMap;
 
 class eDVBCAService: public Object
 {
+	eSocketNotifier *m_sn;
 	eServiceReferenceDVB m_service;
 	uint8_t m_used_demux[32];
 	unsigned int m_prev_build_hash;
@@ -35,11 +47,19 @@ class eDVBCAService: public Object
 	eTimer m_retryTimer;
 	void sendCAPMT();
 	void Connect();
+	void socketCB(int what);
 
+	static void DVBChannelAdded(eDVBChannel*);
+	static void DVBChannelStateChanged(iDVBChannel*);
 	static CAServiceMap exist;
+	static ChannelMap exist_channels;
+	static ePtr<eConnection> m_chanAddedConn;
+	static channel_data *getChannelData(eDVBChannelID &chid);
+
 	eDVBCAService();
 	~eDVBCAService();
 public:
+	static void registerChannelCallback(eDVBResourceManager *res_mgr);
 	static RESULT register_service( const eServiceReferenceDVB &ref, int demux_nums[2], eDVBCAService *&caservice );
 	static RESULT unregister_service( const eServiceReferenceDVB &ref, int demux_nums[2], eTable<ProgramMapSection> *ptr );
 	void buildCAPMT(eTable<ProgramMapSection> *ptr);