X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/8fc0752931ad7a8efa802b0a0f0246a2b50eca6b..95c570d26ce81e3dd1e0610ff6c5c0b34d75ba5a:/lib/dvb/idvb.h

diff --git a/lib/dvb/idvb.h b/lib/dvb/idvb.h
index f20de190..1f8aebda 100644
--- a/lib/dvb/idvb.h
+++ b/lib/dvb/idvb.h
@@ -1,6 +1,8 @@
 #ifndef __dvb_idvb_h
 #define __dvb_idvb_h
 
+#ifndef SWIG
+
 #if HAVE_DVB_API_VERSION < 3
 #include <ost/frontend.h>
 #define FRONTENDPARAMETERS FrontendParameters
@@ -16,6 +18,14 @@
 #include <libsig_comp.h>
 #include <connection.h>
 
+#if defined(__GNUC__) && ((__GNUC__ == 3 && __GNUC_MINOR__ >= 1) || __GNUC__ == 4 )  // check if gcc version >= 3.1
+#include <ext/slist>
+#define CAID_LIST __gnu_cxx::slist<uint16_t>
+#else
+#include <slist>
+#define CAID_LIST std::slist<uint16_t>
+#endif
+
 struct eBouquet
 {
 	std::string m_bouquet_name;
@@ -24,7 +34,7 @@ struct eBouquet
 	list m_services;
 // the following five methods are implemented in db.cpp
 	RESULT flushChanges();
-	RESULT addService(const eServiceReference &);
+	RESULT addService(const eServiceReference &, eServiceReference before=eServiceReference());
 	RESULT removeService(const eServiceReference &);
 	RESULT moveService(const eServiceReference &, unsigned int);
 	RESULT setListName(const std::string &name);
@@ -160,6 +170,20 @@ struct eServiceReferenceDVB: public eServiceReference
 	eTransportStreamID getParentTransportStreamID() const { return eTransportStreamID(data[6]); }
 	void setParentTransportStreamID( eTransportStreamID tsid ) { data[6]=tsid.get(); }
 
+	eServiceReferenceDVB getParentServiceReference() const
+	{
+		eServiceReferenceDVB tmp(*this);
+		if (data[5] && data[6])
+		{
+			tmp.data[1] = data[5];
+			tmp.data[2] = data[6];
+			tmp.data[5] = tmp.data[6] = 0;
+		}
+		else
+			tmp.type = idInvalid;
+		return tmp;
+	}
+
 	eServiceReferenceDVB(eDVBNamespace dvbnamespace, eTransportStreamID transport_stream_id, eOriginalNetworkID original_network_id, eServiceID service_id, int service_type)
 		:eServiceReference(eServiceReference::idDVB, 0)
 	{
@@ -204,15 +228,21 @@ class eDVBChannelQuery;
 class eDVBService: public iStaticServiceInformation
 {
 	DECLARE_REF(eDVBService);
+	int *m_cache;
+	void initCache();
+	void copyCache(int *source);
 public:
 	enum cacheID
 	{
-		cVPID, cAPID, cTPID, cPCRPID, cAC3PID, cacheMax
+		cVPID, cAPID, cTPID, cPCRPID, cAC3PID,
+		cVTYPE, cACHANNEL, cAC3DELAY, cPCMDELAY,
+		cSUBTITLE, cacheMax
 	};
 
-	int getCachePID(cacheID);
-	void setCachePID(cacheID, int);
-	bool cacheEmpty() { return m_cache.empty(); }
+	int getCacheEntry(cacheID);
+	void setCacheEntry(cacheID, int);
+
+	bool cacheEmpty();
 
 	eDVBService();
 		/* m_service_name_sort is uppercase, with special chars removed, to increase sort performance. */
@@ -220,10 +250,21 @@ public:
 	std::string m_provider_name;
 	
 	void genSortName();
-	
+
 	int m_flags;
-	std::set<int> m_ca;
-	std::map<int,int> m_cache;
+	enum
+	{
+		dxNoSDT=1,    // don't get SDT
+//nyi	dxDontshow=2,
+		dxNoDVB=4,  // dont use PMT for this service ( use cached pids )
+		dxHoldName=8,
+		dxNewFound=64,
+	};
+
+	bool usePMT() const { return !(m_flags & dxNoDVB); }
+
+	CAID_LIST m_ca;
+
 	virtual ~eDVBService();
 	
 	eDVBService &operator=(const eDVBService &);
@@ -263,7 +304,9 @@ public:
 		tSatellitePosition,
 		tChannelID,
 		tAND,
-		tOR
+		tOR,
+		tAny,
+		tFlags
 	};
 	
 	int m_type;
@@ -285,6 +328,13 @@ public:
 class iDVBChannelList: public iObject
 {
 public:
+	virtual RESULT removeService(const eServiceReference &service)=0;
+	virtual RESULT removeServices(eDVBChannelID chid=eDVBChannelID(), unsigned int orb_pos=0xFFFFFFFF)=0;
+	virtual RESULT removeServices(int dvb_namespace=-1, int tsid=-1, int onid=-1, unsigned int orb_pos=0xFFFFFFFF)=0;
+	virtual RESULT addFlag(const eServiceReference &service, unsigned int flagmask=0xFFFFFFFF)=0;
+	virtual RESULT removeFlag(const eServiceReference &service, unsigned int flagmask=0xFFFFFFFF)=0;
+	virtual RESULT removeFlags(unsigned int flagmask, eDVBChannelID chid=eDVBChannelID(), unsigned int orb_pos=0xFFFFFFFF)=0;
+	virtual RESULT removeFlags(unsigned int flagmask, int dvb_namespace=-1, int tsid=-1, int onid=-1, unsigned int orb_pos=0xFFFFFFFF)=0;
 	virtual RESULT addChannelToList(const eDVBChannelID &id, iDVBFrontendParameters *feparm)=0;
 	virtual RESULT removeChannel(const eDVBChannelID &id)=0;
 	
@@ -299,29 +349,41 @@ public:
 	virtual RESULT startQuery(ePtr<iDVBChannelListQuery> &query, eDVBChannelQuery *query, const eServiceReference &source)=0;
 };
 
+#endif  // SWIG
+
 class iDVBFrontendParameters: public iObject
 {
+#ifdef SWIG
+	iDVBFrontendParameters();
+	~iDVBFrontendParameters();
+#endif
 public:
-	virtual RESULT getSystem(int &type) const = 0;
-	virtual RESULT getDVBS(eDVBFrontendParametersSatellite &p) const = 0;
-	virtual RESULT getDVBC(eDVBFrontendParametersCable &p) const = 0;
-	virtual RESULT getDVBT(eDVBFrontendParametersTerrestrial &p) const = 0;
+	virtual RESULT getSystem(int &SWIG_OUTPUT) const = 0;
+	virtual RESULT getDVBS(eDVBFrontendParametersSatellite &SWIG_OUTPUT) const = 0;
+	virtual RESULT getDVBC(eDVBFrontendParametersCable &SWIG_OUTPUT) const = 0;
+	virtual RESULT getDVBT(eDVBFrontendParametersTerrestrial &SWIG_OUTPUT) const = 0;
 	
-	virtual RESULT calculateDifference(const iDVBFrontendParameters *parm, int &diff) const = 0;
-	virtual RESULT getHash(unsigned long &hash) const = 0;
+	virtual RESULT calculateDifference(const iDVBFrontendParameters *parm, int &SWIG_OUTPUT, bool exact) const = 0;
+	virtual RESULT getHash(unsigned long &SWIG_OUTPUT) const = 0;
 };
 
 #define MAX_DISEQC_LENGTH  16
 
 class eDVBDiseqcCommand
 {
+#ifndef SWIG
 public:
+#endif
 	int len;
 	__u8 data[MAX_DISEQC_LENGTH];
 #if HAVE_DVB_API_VERSION < 3
 	int tone;
 	int voltage;
 #endif
+#ifdef SWIG
+public:
+#endif
+	void setCommandString(const char *str);
 };
 
 class iDVBSatelliteEquipmentControl;
@@ -333,9 +395,11 @@ public:
 	enum {
 		feSatellite, feCable, feTerrestrial
 	};
-	virtual RESULT getFrontendType(int &type)=0;
+	virtual RESULT getFrontendType(int &SWIG_OUTPUT)=0;
 	virtual RESULT tune(const iDVBFrontendParameters &where)=0;
+#ifndef SWIG
 	virtual RESULT connectStateChange(const Slot1<void,iDVBFrontend*> &stateChange, ePtr<eConnection> &connection)=0;
+#endif
 	enum {
 		stateIdle = 0,
 		stateTuning = 1,
@@ -343,7 +407,7 @@ public:
 		stateLock = 3,
 		stateLostLock = 4,
 	};
-	virtual RESULT getState(int &state)=0;
+	virtual RESULT getState(int &SWIG_OUTPUT)=0;
 	enum {
 		toneOff, toneOn
 	};
@@ -354,25 +418,30 @@ public:
 	virtual RESULT setVoltage(int voltage)=0;
 	virtual RESULT sendDiseqc(const eDVBDiseqcCommand &diseqc)=0;
 	virtual RESULT sendToneburst(int burst)=0;
+#ifndef SWIG
 	virtual RESULT setSEC(iDVBSatelliteEquipmentControl *sec)=0;
 	virtual RESULT setSecSequence(const eSecCommandList &list)=0;
-
+#endif
 	enum {
-		bitErrorRate, signalPower, signalQuality
+		bitErrorRate, signalPower, signalQuality, locked, synced, frontendNumber
 	};
 	virtual int readFrontendData(int type)=0;
+	virtual PyObject *readTransponderData(bool original)=0;
 
+#ifndef SWIG
 	virtual RESULT getData(int num, int &data)=0;
 	virtual RESULT setData(int num, int val)=0;
-	
 		/* 0 means: not compatible. other values are a priority. */
 	virtual int isCompatibleWith(ePtr<iDVBFrontendParameters> &feparm)=0;
+#endif
 };
+TEMPLATE_TYPEDEF(ePtr<iDVBFrontend>, iDVBFrontendPtr);
 
+#ifndef SWIG
 class iDVBSatelliteEquipmentControl: public iObject
 {
 public:
-	virtual RESULT prepare(iDVBFrontend &frontend, FRONTENDPARAMETERS &parm, eDVBFrontendParametersSatellite &sat, int frontend_id)=0;
+	virtual RESULT prepare(iDVBFrontend &frontend, FRONTENDPARAMETERS &parm, const eDVBFrontendParametersSatellite &sat, int frontend_id)=0;
 	virtual int canTune(const eDVBFrontendParametersSatellite &feparm, iDVBFrontend *fe, int frontend_id)=0;
 	virtual void setRotorMoving(bool)=0;
 };
@@ -381,6 +450,7 @@ struct eDVBCIRouting
 {
 	int enabled;
 };
+#endif // SWIG
 
 class iDVBChannel: public iObject
 {
@@ -392,17 +462,23 @@ public:
 		state_failed,      /* tuning failed. */
 		state_unavailable, /* currently unavailable, will be back without further interaction */
 		state_ok,          /* ok */
+		state_last_instance, /* just one reference to this channel is left */
 		state_release      /* channel is being shut down. */
 	};
-	
+	virtual RESULT getState(int &SWIG_OUTPUT)=0;	
+
+		/* direct frontend access for raw channels and/or status inquiries. */
+	virtual RESULT getFrontend(ePtr<iDVBFrontend> &)=0;
+
+#ifndef SWIG
+	virtual RESULT getCurrentFrontendParameters(ePtr<iDVBFrontendParameters> &)=0;
 	enum 
 	{
 		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;
-	virtual RESULT getState(int &state)=0;
-	
+
 		/* demux capabilities */
 	enum
 	{
@@ -412,19 +488,21 @@ public:
 	virtual RESULT setCIRouting(const eDVBCIRouting &routing)=0;
 	virtual RESULT getDemux(ePtr<iDVBDemux> &demux, int cap=0)=0;
 	
-		/* direct frontend access for raw channels and/or status inquiries. */
-	virtual RESULT getFrontend(ePtr<iDVBFrontend> &frontend)=0;
-	
 		/* use count handling */
 	virtual void AddUse() = 0;
 	virtual void ReleaseUse() = 0;
+#endif
 };
+TEMPLATE_TYPEDEF(eUsePtr<iDVBChannel>, iDVBChannelPtr);
+
+#ifndef SWIG
 
 	/* signed, so we can express deltas. */
 	
 typedef long long pts_t;
 
 class iFilePushScatterGather;
+class iTSMPEGDecoder;
 
 	/* note that a cue sheet describes the logical positions. thus 
 	   everything is specified in pts and not file positions */
@@ -441,9 +519,10 @@ public:
 	
 	void clear();
 	void addSourceSpan(const pts_t &begin, const pts_t &end);
+	void commitSpans();
 	
 	void setSkipmode(const pts_t &ratio); /* 90000 is 1:1 */
-	void setDecodingDemux(iDVBDemux *demux);
+	void setDecodingDemux(iDVBDemux *demux, iTSMPEGDecoder *decoder);
 	
 			/* frontend and backend */
 	eSingleLock m_lock;
@@ -457,6 +536,7 @@ public:
 	pts_t m_skipmode_ratio;
 	Signal1<void,int> m_event;
 	ePtr<iDVBDemux> m_decoding_demux;
+	ePtr<iTSMPEGDecoder> m_decoder;
 };
 
 class iDVBPVRChannel: public iDVBChannel
@@ -486,6 +566,7 @@ public:
 };
 
 class iDVBSectionReader;
+class iDVBPESReader;
 class iDVBTSRecorder;
 class iTSMPEGDecoder;
 
@@ -493,8 +574,9 @@ class iDVBDemux: public iObject
 {
 public:
 	virtual RESULT createSectionReader(eMainloop *context, ePtr<iDVBSectionReader> &reader)=0;
+	virtual RESULT createPESReader(eMainloop *context, ePtr<iDVBPESReader> &reader)=0;
 	virtual RESULT createTSRecorder(ePtr<iDVBTSRecorder> &recorder)=0;
-	virtual RESULT getMPEGDecoder(ePtr<iTSMPEGDecoder> &reader)=0;
+	virtual RESULT getMPEGDecoder(ePtr<iTSMPEGDecoder> &reader, int primary=1)=0;
 	virtual RESULT getSTC(pts_t &pts, int num=0)=0;
 	virtual RESULT getCADemuxID(uint8_t &id)=0;
 	virtual RESULT flush()=0;
@@ -504,13 +586,23 @@ class iTSMPEGDecoder: public iObject
 {
 public:
 	enum { pidDisabled = -1 };
-		/** Set Displayed Video PID */
-	virtual RESULT setVideoPID(int vpid)=0;
+		/** Set Displayed Video PID and type */
+	virtual RESULT setVideoPID(int vpid, int type)=0;
 
-	enum { af_MPEG, af_AC3, af_DTS };
+	enum { af_MPEG, af_AC3, af_DTS, af_AAC };
 		/** Set Displayed Audio PID and type */
 	virtual RESULT setAudioPID(int apid, int type)=0;
 
+	enum { ac_left, ac_stereo, ac_right };
+		/** Set Displayed Audio Channel */
+	virtual RESULT setAudioChannel(int channel)=0;
+	virtual int getAudioChannel()=0;
+
+	virtual RESULT setPCMDelay(int delay)=0;
+	virtual int getPCMDelay()=0;
+	virtual RESULT setAC3Delay(int delay)=0;
+	virtual int getAC3Delay()=0;
+
 		/** Set Displayed Videotext PID */
 	virtual RESULT setTextPID(int vpid)=0;
 
@@ -548,6 +640,13 @@ public:
 	virtual RESULT setZoom(int what)=0;
 	
 	virtual RESULT setTrickmode(int what) = 0;
+	
+	virtual RESULT getPTS(int what, pts_t &pts) = 0;
+
+	virtual RESULT showSinglePic(const char *filename) = 0;
+
+	virtual RESULT setRadioPic(const std::string &filename) = 0;
 };
 
+#endif //SWIG
 #endif