X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fdvb%2Fdvb.h;h=5399f45e6e7a21d40279730f4851c2a9304a14e0;hp=bceb9ad0409f49a77dc1ad6cab057e14001afbc2;hb=7882dec4e8e3e87cee0cf4eeb781119c196ba725;hpb=6696994da0d59a3b483eda65d1dc8b1a9df67cc0

diff --git a/lib/dvb/dvb.h b/lib/dvb/dvb.h
index bceb9ad..5399f45 100644
--- a/lib/dvb/dvb.h
+++ b/lib/dvb/dvb.h
@@ -10,8 +10,11 @@
 #include <lib/dvb/demux.h>
 #include <lib/dvb/frontend.h>
 #include <lib/dvb/tstools.h>
+#include <lib/dvb/esection.h>
 #include <connection.h>
 
+#include <dvbsi++/service_description_section.h>
+
 class eDVBChannel;
 
 	/* we do NOT handle resource conflicts here. instead, the allocateChannel
@@ -22,7 +25,7 @@ class iDVBAdapter;
 class eDVBRegisteredFrontend: public iObject, public Object
 {
 	DECLARE_REF(eDVBRegisteredFrontend);
-	eTimer *disable;
+	ePtr<eTimer> disable;
 	void closeFrontend()
 	{
 		if (!m_inuse && m_frontend->closeFrontend()) // frontend busy
@@ -31,14 +34,10 @@ class eDVBRegisteredFrontend: public iObject, public Object
 public:
 	Signal0<void> stateChanged;
 	eDVBRegisteredFrontend(eDVBFrontend *fe, iDVBAdapter *adap)
-		:disable(new eTimer(eApp)), m_adapter(adap), m_frontend(fe), m_inuse(0)
+		:disable(eTimer::create(eApp)), m_adapter(adap), m_frontend(fe), m_inuse(0)
 	{
 		CONNECT(disable->timeout, eDVBRegisteredFrontend::closeFrontend);
 	}
-	~eDVBRegisteredFrontend()
-	{
-		delete disable;
-	}
 	void dec_use()
 	{
 		if (!--m_inuse)
@@ -164,7 +163,7 @@ class eDVBResourceManager: public iObject, public Object
 
 	eUsePtr<iDVBChannel> m_cached_channel;
 	Connection m_cached_channel_state_changed_conn;
-	eTimer m_releaseCachedChannelTimer;
+	ePtr<eTimer> m_releaseCachedChannelTimer;
 	void DVBChannelStateChanged(iDVBChannel*);
 	void feStateChanged();
 #ifndef SWIG
@@ -188,7 +187,7 @@ public:
 	};
 	
 	RESULT connectChannelAdded(const Slot1<void,eDVBChannel*> &channelAdded, ePtr<eConnection> &connection);
-	int canAllocateChannel(const eDVBChannelID &channelid, const eDVBChannelID &ignore);
+	int canAllocateChannel(const eDVBChannelID &channelid, const eDVBChannelID &ignore, bool simulate=false);
 
 		/* allocate channel... */
 	RESULT allocateChannel(const eDVBChannelID &channelid, eUsePtr<iDVBChannel> &channel, bool simulate=false);
@@ -210,7 +209,7 @@ public:
 #ifdef SWIG
 public:
 #endif
-	int canAllocateFrontend(ePtr<iDVBFrontendParameters> &feparm);
+	int canAllocateFrontend(ePtr<iDVBFrontendParameters> &feparm, bool simulate=false);
 	bool canMeasureFrontendInputPower();
 	PSignal1<void,int> frontendUseMaskChanged;
 	SWIG_VOID(RESULT) allocateRawChannel(eUsePtr<iDVBChannel> &SWIG_OUTPUT, int slot_index);
@@ -263,6 +262,8 @@ public:
 	RESULT getCurrentPosition(iDVBDemux *decoding_demux, pts_t &pos, int mode);
 
 	int getUseCount() { return m_use_count; }
+
+	RESULT requestTsidOnid(ePyObject callback);
 private:
 	ePtr<eDVBAllocatedFrontend> m_frontend;
 	ePtr<eDVBAllocatedDemux> m_demux, m_decoder_demux;
@@ -290,7 +291,7 @@ private:
 	
 	void cueSheetEvent(int event);
 	ePtr<eConnection> m_conn_cueSheetEvent;
-	int m_skipmode_m, m_skipmode_n;
+	int m_skipmode_m, m_skipmode_n, m_skipmode_frames, m_skipmode_frames_remainder;
 	
 	std::list<std::pair<off_t, off_t> > m_source_span;
 	void getNextSourceSpan(off_t current_offset, size_t bytes_read, off_t &start, size_t &size);
@@ -303,6 +304,12 @@ private:
 	oRefCount m_use_count;
 	void AddUse();
 	void ReleaseUse();
+
+		/* for tsid/onid read */
+	ePyObject m_tsid_onid_callback;
+	ePtr<iDVBDemux> m_tsid_onid_demux;
+	ePtr<eTable<ServiceDescriptionSection> > m_SDT;
+	void SDTready(int err);
 };
 #endif // SWIG