X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/0d34f9703fc13e99c4d76a0ee539d58d39dded2d..9c22bd14f76cbc38c14d417dc185cdcdfc610665:/lib/dvb/idvb.h

diff --git a/lib/dvb/idvb.h b/lib/dvb/idvb.h
index c1c0377f..c7db9779 100644
--- a/lib/dvb/idvb.h
+++ b/lib/dvb/idvb.h
@@ -1,7 +1,6 @@
 #ifndef __dvb_idvb_h
 #define __dvb_idvb_h
 
-#include <config.h>
 #if HAVE_DVB_API_VERSION < 3
 #include <ost/frontend.h>
 #define FRONTENDPARAMETERS FrontendParameters
@@ -22,11 +21,12 @@ struct eBouquet
 	std::string m_filename;  // without path.. just name
 	typedef std::list<eServiceReference> list;
 	list m_services;
-// the following four methods are implemented in db.cpp
+// the following five methods are implemented in db.cpp
 	RESULT flushChanges();
 	RESULT addService(const eServiceReference &);
 	RESULT removeService(const eServiceReference &);
 	RESULT moveService(const eServiceReference &, unsigned int);
+	RESULT setListName(const std::string &name);
 };
 
 		/* these structures have by intention no operator int() defined.
@@ -185,6 +185,11 @@ struct eServiceReferenceDVB: public eServiceReference
 		:eServiceReference(eServiceReference::idDVB, 0)
 	{
 	}
+
+	eServiceReferenceDVB(const std::string &string)
+		:eServiceReference(string)
+	{
+	}
 };
 
 
@@ -343,7 +348,7 @@ public:
 	};
 	virtual RESULT setTone(int tone)=0;
 	enum {
-		voltageOff, voltage13, voltage18
+		voltageOff, voltage13, voltage18, voltage13_5, voltage18_5
 	};
 	virtual RESULT setVoltage(int voltage)=0;
 	virtual RESULT sendDiseqc(const eDVBDiseqcCommand &diseqc)=0;
@@ -388,7 +393,13 @@ public:
 		state_ok,          /* ok */
 		state_release      /* channel is being shut down. */
 	};
+	
+	enum 
+	{
+		evtEOF, 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;
 	virtual RESULT getState(int &state)=0;
 	
 		/* demux capabilities */
@@ -460,12 +471,15 @@ public:
 		/** Set Displayed Audio PID and type */
 	virtual RESULT setAudioPID(int apid, int type)=0;
 
+		/** Set Displayed Videotext PID */
+	virtual RESULT setTextPID(int vpid)=0;
+
 		/** Set Sync mode to PCR */
 	virtual RESULT setSyncPCR(int pcrpid)=0;
 	enum { sm_Audio, sm_Video };
 		/** Set Sync mode to either audio or video master */
 	virtual RESULT setSyncMaster(int who)=0;
-	
+
 		/** Apply settings */
 	virtual RESULT start()=0;