X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fdvb%2Fidvb.h;h=f1217a6a7adfec8e99d2d59fefbd60f4ca5d65a3;hp=cfa98ecf1d960aea4a84d2b117a20c3acae71d19;hb=0a62b65175152c42976d4cb04fb7026d9f910915;hpb=99ac184fdce7f1469851ed79dfb9a481c786ec23

diff --git a/lib/dvb/idvb.h b/lib/dvb/idvb.h
index cfa98ec..f1217a6 100644
--- a/lib/dvb/idvb.h
+++ b/lib/dvb/idvb.h
@@ -385,13 +385,13 @@ public:
 	
 	virtual RESULT getChannelFrontendData(const eDVBChannelID &id, ePtr<iDVBFrontendParameters> &parm)=0;
 	
-	virtual RESULT addService(const eServiceReferenceDVB &service, eDVBService *service)=0;
+	virtual RESULT addService(const eServiceReferenceDVB &reference, eDVBService *service)=0;
 	virtual RESULT getService(const eServiceReferenceDVB &reference, ePtr<eDVBService> &service)=0;
 	virtual RESULT flush()=0;
 
 	virtual RESULT getBouquet(const eServiceReference &ref,  eBouquet* &bouquet)=0;
 
-	virtual RESULT startQuery(ePtr<iDVBChannelListQuery> &query, eDVBChannelQuery *query, const eServiceReference &source)=0;
+	virtual RESULT startQuery(ePtr<iDVBChannelListQuery> &query, eDVBChannelQuery *q, const eServiceReference &source)=0;
 };
 
 #endif  // SWIG
@@ -459,6 +459,8 @@ class iDVBFrontend: public iDVBFrontend_ENUMS, public iObject
 public:
 	virtual RESULT getFrontendType(int &SWIG_OUTPUT)=0;
 	virtual RESULT tune(const iDVBFrontendParameters &where)=0;
+	virtual int closeFrontend(bool force = false, bool no_delayed = false)=0;
+	virtual void reopenFrontend()=0;
 #ifndef SWIG
 	virtual RESULT connectStateChange(const Slot1<void,iDVBFrontend*> &stateChange, ePtr<eConnection> &connection)=0;
 #endif
@@ -469,7 +471,7 @@ public:
 	virtual RESULT sendToneburst(int burst)=0;
 #ifndef SWIG
 	virtual RESULT setSEC(iDVBSatelliteEquipmentControl *sec)=0;
-	virtual RESULT setSecSequence(const eSecCommandList &list)=0;
+	virtual RESULT setSecSequence(eSecCommandList &list)=0;
 #endif
 	virtual int readFrontendData(int type)=0;
 	virtual void getFrontendStatus(SWIG_PYOBJECT(ePyObject) dest)=0;
@@ -489,8 +491,9 @@ class iDVBSatelliteEquipmentControl: public iObject
 {
 public:
 	virtual RESULT prepare(iDVBFrontend &frontend, FRONTENDPARAMETERS &parm, const eDVBFrontendParametersSatellite &sat, int frontend_id, unsigned int timeout)=0;
+	virtual void prepareTurnOffSatCR(iDVBFrontend &frontend, int satcr)=0;
 	virtual int canTune(const eDVBFrontendParametersSatellite &feparm, iDVBFrontend *fe, int frontend_id, int *highest_score_lnb=0)=0;
-	virtual void setRotorMoving(bool)=0;
+	virtual void setRotorMoving(int slotid, bool)=0;
 };
 
 struct eDVBCIRouting
@@ -506,6 +509,7 @@ public:
 		/* direct frontend access for raw channels and/or status inquiries. */
 	virtual SWIG_VOID(RESULT) getFrontend(ePtr<iDVBFrontend> &SWIG_OUTPUT)=0;
 	virtual RESULT requestTsidOnid(SWIG_PYOBJECT(ePyObject) callback) { return -1; }
+	virtual int reserveDemux() { return -1; }
 #ifndef SWIG
 	enum
 	{
@@ -522,7 +526,7 @@ public:
 	virtual RESULT getCurrentFrontendParameters(ePtr<iDVBFrontendParameters> &)=0;
 	enum 
 	{
-		evtEOF, evtSOF, evtFailed
+		evtPreStart, evtEOF, evtSOF, evtFailed
 	};
 	virtual RESULT connectStateChange(const Slot1<void,iDVBChannel*> &stateChange, ePtr<eConnection> &connection)=0;
 	virtual RESULT connectEvent(const Slot2<void,iDVBChannel*,int> &eventChange, ePtr<eConnection> &connection)=0;