X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/80132b0b269cb147e42c61824a73ad70f707acf5..c797d4040a1dfac3873b481111a84a5c557432f3:/lib/dvb/pmt.h

diff --git a/lib/dvb/pmt.h b/lib/dvb/pmt.h
index 95d3cc43..f34d761a 100644
--- a/lib/dvb/pmt.h
+++ b/lib/dvb/pmt.h
@@ -1,6 +1,7 @@
 #ifndef __lib_dvb_dvbmid_h
 #define __lib_dvb_dvbmid_h
 
+#ifndef SWIG
 #include <map>
 #include <lib/dvb/idvb.h>
 #include <lib/dvb/dvb.h>
@@ -19,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;
@@ -34,18 +47,29 @@ 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);
 };
 
+#endif
+
 class eDVBServicePMTHandler: public Object
 {
+#ifndef SWIG
 	friend class eDVBCAService;
 	eServiceReferenceDVB m_reference;
 	ePtr<eDVBService> m_service;
@@ -79,7 +103,14 @@ class eDVBServicePMTHandler: public Object
 public:
 	eDVBServicePMTHandler();
 	~eDVBServicePMTHandler();
-	
+#endif
+
+#ifdef SWIG
+private:
+	eDVBServicePMTHandler();
+public:
+#endif
+
 	enum
 	{
 		eventNoResources,  // a requested resource couldn't be allocated
@@ -92,8 +123,10 @@ public:
 		
 		eventSOF,          // seek pre start
 		eventEOF,          // a file playback did end
+		
+		eventMisconfiguration, // a channel was not found in any list, or no frontend was found which could provide this channel
 	};
-
+#ifndef SWIG
 	Signal1<void,int> serviceEvent;
 
 	struct videoStream
@@ -146,12 +179,15 @@ public:
 	{
 		std::vector<videoStream> videoStreams;
 		std::vector<audioStream> audioStreams;
+		int defaultAudioStream;
 		std::vector<subtitleStream> subtitleStreams;
 		std::set<uint16_t> caids;
 		int pcrPid;
 		int pmtPid;
 		int textPid;
 		bool isCrypted() { return !caids.empty(); }
+		
+		PyObject *createPythonObject();
 	};
 
 	int getProgramInfo(struct program &program);
@@ -171,6 +207,7 @@ public:
 private:
 	bool m_have_cached_program;
 	program m_cached_program;
+#endif
 };
 
 #endif