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

diff --git a/lib/dvb/dvb.h b/lib/dvb/dvb.h
index 9277160..3e9fc7f 100644
--- a/lib/dvb/dvb.h
+++ b/lib/dvb/dvb.h
@@ -12,6 +12,7 @@
 #include <lib/dvb/tstools.h>
 #include <lib/dvb/esection.h>
 #include <connection.h>
+#include <lib/dvb/fbc.h>
 
 #include <dvbsi++/service_description_section.h>
 
@@ -135,7 +136,7 @@ class eDVBResourceManager: public iObject, public Object
 	DECLARE_REF(eDVBResourceManager);
 	int avail, busy;
 
-	enum { DM7025, DM800, DM500HD, DM800SE, DM8000 };
+	enum { DM7025, DM800, DM500HD, DM800SE, DM8000, DM7020HD };
 
 	int m_boxtype;
 
@@ -143,6 +144,7 @@ class eDVBResourceManager: public iObject, public Object
 	eSmartPtrList<eDVBRegisteredDemux> m_demux;
 	eSmartPtrList<eDVBRegisteredFrontend> m_frontend, m_simulate_frontend;
 	void addAdapter(iDVBAdapter *adapter);
+	void setUsbTuner();
 
 	struct active_channel
 	{
@@ -158,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);
 
@@ -191,11 +196,11 @@ public:
 	};
 	
 	RESULT connectChannelAdded(const Slot1<void,eDVBChannel*> &channelAdded, ePtr<eConnection> &connection);
-	int canAllocateChannel(const eDVBChannelID &channelid, const eDVBChannelID &ignore, bool simulate=false);
+	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'.
@@ -218,6 +223,8 @@ public:
 	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>,
@@ -260,7 +267,7 @@ public:
 	RESULT playFile(const char *file);
 	void stopFile();
 
-	RESULT playSource(ePtr<iDataSource>& source, const char *priv=NULL);
+	RESULT playSource(ePtr<iTsSource>& source, const char *priv=NULL);
 	void stopSource();
 
 	void setCueSheet(eCueSheet *cuesheet);
@@ -281,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;