X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/d74be53af36f7005a29385015fd3d0a4f21014b5..0c59a4279f93f08fe95fca5f2e55f3e025f0cceb:/lib/dvb/pmt.h

diff --git a/lib/dvb/pmt.h b/lib/dvb/pmt.h
index 086619d3..d3a7faa7 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
 {
+	ePtr<eSocketNotifier> m_sn;
 	eServiceReferenceDVB m_service;
 	uint8_t m_used_demux[32];
 	unsigned int m_prev_build_hash;
@@ -32,14 +44,22 @@ 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);
 
+	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);
@@ -103,6 +123,8 @@ 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;
@@ -157,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);
@@ -177,7 +202,7 @@ public:
 	int getChannel(eUsePtr<iDVBChannel> &channel);
 	void resetCachedProgram() { m_have_cached_program = false; }
 
-	int tune(eServiceReferenceDVB &ref, int use_decode_demux, eCueSheet *sg=0);
+	int tune(eServiceReferenceDVB &ref, int use_decode_demux, eCueSheet *sg=0, bool simulate=false);
 	void free();
 private:
 	bool m_have_cached_program;