X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=lib%2Fdvb%2Fdvb.h;h=3e9fc7fde4ab573b0c532bcf00d516619860106d;hb=eb510064c67c19fec47fd04ea03017c17569e3c5;hp=1a773efadb4d8a1f6b00a473061f58acb1c2412b;hpb=0c59a4279f93f08fe95fca5f2e55f3e025f0cceb;p=vuplus_dvbapp

diff --git a/lib/dvb/dvb.h b/lib/dvb/dvb.h
index 1a773ef..3e9fc7f 100644
--- a/lib/dvb/dvb.h
+++ b/lib/dvb/dvb.h
@@ -10,7 +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 <lib/dvb/fbc.h>
+
+#include <dvbsi++/service_description_section.h>
 
 class eDVBChannel;
 
@@ -132,10 +136,15 @@ class eDVBResourceManager: public iObject, public Object
 	DECLARE_REF(eDVBResourceManager);
 	int avail, busy;
 
+	enum { DM7025, DM800, DM500HD, DM800SE, DM8000, DM7020HD };
+
+	int m_boxtype;
+
 	eSmartPtrList<iDVBAdapter> m_adapter;
 	eSmartPtrList<eDVBRegisteredDemux> m_demux;
 	eSmartPtrList<eDVBRegisteredFrontend> m_frontend, m_simulate_frontend;
 	void addAdapter(iDVBAdapter *adapter);
+	void setUsbTuner();
 
 	struct active_channel
 	{
@@ -151,8 +160,11 @@ class eDVBResourceManager: public iObject, public Object
 	ePtr<iDVBChannelList> m_list;
 	ePtr<iDVBSatelliteEquipmentControl> m_sec;
 	static eDVBResourceManager *instance;
-	
+
+	ePtr<eFBCTunerManager> m_fbc_mng;
+ 
 	friend class eDVBChannel;
+	friend class eFBCTunerManager;
 	RESULT addChannel(const eDVBChannelID &chid, eDVBChannel *ch);
 	RESULT removeChannel(eDVBChannel *ch);
 
@@ -184,11 +196,11 @@ 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, int &system, bool simulate=false);
 
 		/* allocate channel... */
 	RESULT allocateChannel(const eDVBChannelID &channelid, eUsePtr<iDVBChannel> &channel, bool simulate=false);
-	RESULT allocatePVRChannel(eUsePtr<iDVBPVRChannel> &channel);
+	RESULT allocatePVRChannel(const eDVBChannelID &channelid, eUsePtr<iDVBPVRChannel> &channel);
 	static RESULT getInstance(ePtr<eDVBResourceManager> &);
 
 			/* allocates a frontend able to tune to frontend paramters 'feperm'.
@@ -202,15 +214,17 @@ public:
 
 	RESULT allocateFrontendByIndex(ePtr<eDVBAllocatedFrontend> &fe, int slot_index);
 			/* allocate a demux able to filter on the selected frontend. */
-	RESULT allocateDemux(eDVBRegisteredFrontend *fe, ePtr<eDVBAllocatedDemux> &demux, int cap);
+	RESULT allocateDemux(eDVBRegisteredFrontend *fe, ePtr<eDVBAllocatedDemux> &demux, int &cap);
 #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);
 	PyObject *setFrontendSlotInformations(SWIG_PYOBJECT(ePyObject) list);
+	bool frontendIsCompatible(int index, const char *type);
+	void setFrontendType(int index, const char *type);
 };
 SWIG_TEMPLATE_TYPEDEF(ePtr<eDVBResourceManager>, eDVBResourceManager);
 SWIG_EXTEND(ePtr<eDVBResourceManager>,
@@ -252,13 +266,19 @@ public:
 		/* iDVBPVRChannel */
 	RESULT playFile(const char *file);
 	void stopFile();
-	
+
+	RESULT playSource(ePtr<iTsSource>& source, const char *priv=NULL);
+	void stopSource();
+
 	void setCueSheet(eCueSheet *cuesheet);
 	
 	RESULT getLength(pts_t &len);
 	RESULT getCurrentPosition(iDVBDemux *decoding_demux, pts_t &pos, int mode);
 
 	int getUseCount() { return m_use_count; }
+
+	RESULT requestTsidOnid(ePyObject callback);
+	int reserveDemux();
 private:
 	ePtr<eDVBAllocatedFrontend> m_frontend;
 	ePtr<eDVBAllocatedDemux> m_demux, m_decoder_demux;
@@ -268,6 +288,7 @@ private:
 	Signal1<void,iDVBChannel*> m_stateChanged;
 	Signal2<void,iDVBChannel*,int> m_event;
 	int m_state;
+	ePtr<iTsSource> m_source;
 
 			/* for channel list */
 	ePtr<eDVBResourceManager> m_mgr;
@@ -286,12 +307,12 @@ 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);
 	void flushPVR(iDVBDemux *decoding_demux=0);
-	
+
 	eSingleLock m_cuesheet_lock;
 
 	friend class eUsePtr<eDVBChannel>;
@@ -299,6 +320,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