X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/949a07352f59a32a5ae00f30650a6d067ef59b77..0ecfa70938499a3386c282577e28625d04d4626b:/lib/dvb/idvb.h

diff --git a/lib/dvb/idvb.h b/lib/dvb/idvb.h
index a6533a9c..f5d3d2ee 100644
--- a/lib/dvb/idvb.h
+++ b/lib/dvb/idvb.h
@@ -77,6 +77,14 @@ struct eDVBChannelID
 	eDVBNamespace dvbnamespace;
 	eTransportStreamID transport_stream_id;
 	eOriginalNetworkID original_network_id;
+	
+	bool operator==(const eDVBChannelID &c) const
+	{
+		return dvbnamespace == c.dvbnamespace &&
+			transport_stream_id == c.transport_stream_id &&
+			original_network_id == c.original_network_id;
+	}
+	
 	bool operator<(const eDVBChannelID &c) const
 	{
 		if (dvbnamespace < c.dvbnamespace)
@@ -162,8 +170,18 @@ class eDVBService: public iStaticServiceInformation
 {
 	DECLARE_REF(eDVBService);
 public:
+	enum cacheID
+	{
+		cVPID, cAPID, cTPID, cPCRPID, cAC3PID, cacheMax
+	};
+
+	int getCachePID(cacheID);
+	void setCachePID(cacheID, int);
+	bool cacheEmpty() { return m_cache.empty(); }
+
 	eDVBService();
-	std::string m_service_name;
+		/* m_service_name_sort is uppercase, with special chars removed, to increase sort performance. */
+	std::string m_service_name, m_service_name_sort;
 	std::string m_provider_name;
 	
 	int m_flags;
@@ -175,8 +193,9 @@ public:
 	
 	// iStaticServiceInformation
 	RESULT getName(const eServiceReference &ref, std::string &name);
+	int getLength(const eServiceReference &ref);
 	
-	// for filtering:
+		/* for filtering: */
 	int checkFilter(const eServiceReferenceDVB &ref, const eDVBChannelQuery &query);
 };
 
@@ -190,6 +209,7 @@ class iDVBChannelListQuery: public iObject
 {
 public:
 	virtual RESULT getNextResult(eServiceReferenceDVB &ref)=0;
+	virtual int compareLessEqual(const eServiceReferenceDVB &a, const eServiceReferenceDVB &b)=0;
 };
 
 class eDVBChannelQuery: public iObject
@@ -215,6 +235,9 @@ public:
 	int m_int;
 	eDVBChannelID m_channelid;
 	
+		/* sort is only valid in root, and must be from the enum above. */
+	int m_sort;
+	
 	static RESULT compile(ePtr<eDVBChannelQuery> &res, std::string query);
 	
 	ePtr<eDVBChannelQuery> m_p1, m_p2;
@@ -234,24 +257,6 @@ public:
 	virtual RESULT startQuery(ePtr<iDVBChannelListQuery> &query, eDVBChannelQuery *query)=0;
 };
 
-class iDVBResourceManager: public iObject
-{
-public:
-	/*
-			solange rumloopen bis eine resource gefunden wurde, die eine frequenz
-			tunen will
-			
-			wenn natuerlich sowas schon vorhanden ist, dann einfach ne ref darauf
-			geben. (zwei services auf dem gleichen transponder teilen sich einen
-			channel)
-	*/
-	virtual RESULT setChannelList(iDVBChannelList *list)=0;
-	virtual RESULT getChannelList(ePtr<iDVBChannelList> &list)=0;
-	virtual RESULT allocateChannel(const eDVBChannelID &channel, ePtr<iDVBChannel> &channel)=0;
-	virtual RESULT allocateRawChannel(ePtr<iDVBChannel> &channel)=0;
-	virtual RESULT allocatePVRChannel(int caps)=0;
-};
-
 class SatelliteDeliverySystemDescriptor;
 class CableDeliverySystemDescriptor;
 class TerrestrialDeliverySystemDescriptor;
@@ -359,8 +364,9 @@ public:
 
 #define MAX_DISEQC_LENGTH  16
 
-struct eDVBDiseqcCommand
+class eDVBDiseqcCommand
 {
+public:
 	int len;
 	__u8 data[MAX_DISEQC_LENGTH];
 #if HAVE_DVB_API_VERSION < 3
@@ -370,6 +376,7 @@ struct eDVBDiseqcCommand
 };
 
 class iDVBSatelliteEquipmentControl;
+class eSecCommandList;
 
 class iDVBFrontend: public iObject
 {
@@ -388,7 +395,7 @@ public:
 	};
 	virtual RESULT getState(int &state)=0;
 	enum {
-		toneOn, toneOff
+		toneOff, toneOn
 	};
 	virtual RESULT setTone(int tone)=0;
 	enum {
@@ -396,7 +403,11 @@ public:
 	};
 	virtual RESULT setVoltage(int voltage)=0;
 	virtual RESULT sendDiseqc(const eDVBDiseqcCommand &diseqc)=0;
+	virtual RESULT sendToneburst(int burst)=0;
 	virtual RESULT setSEC(iDVBSatelliteEquipmentControl *sec)=0;
+	virtual RESULT setSecSequence(const eSecCommandList &list)=0;
+	virtual RESULT getData(int num, int &data)=0;
+	virtual RESULT setData(int num, int val)=0;
 };
 
 class iDVBSatelliteEquipmentControl: public iObject
@@ -418,30 +429,63 @@ public:
 		state_idle,        /* not yet tuned */
 		state_tuning,      /* currently tuning (first time) */
 		state_unavailable, /* currently unavailable, will be back without further interaction */
-		state_ok           /* ok */
+		state_ok,          /* ok */
+		state_release      /* channel is being shut down. */
 	};
 	virtual RESULT connectStateChange(const Slot1<void,iDVBChannel*> &stateChange, ePtr<eConnection> &connection)=0;
 	virtual RESULT getState(int &state)=0;
+	
+		/* demux capabilities */
 	enum
 	{
-		cap_decode,
-		cap_ci
+		capDecode = 1,
+		/* capCI = 2 */
 	};
 	virtual RESULT setCIRouting(const eDVBCIRouting &routing)=0;
-	virtual RESULT getDemux(ePtr<iDVBDemux> &demux)=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;
+};
+
+typedef unsigned long long pts_t;
+
+class iDVBPVRChannel: public iDVBChannel
+{
+public:
+	enum
+	{
+		state_eof = state_release + 1  /* end-of-file reached. */
+	};
+	
+		/* FIXME: there are some very ugly buffer-end and ... related problems */
+		/* so this is VERY UGLY. */
+	virtual RESULT playFile(const char *file) = 0;
+	
+	virtual RESULT getLength(pts_t &pts) = 0;
+	virtual RESULT getCurrentPosition(pts_t &pos) = 0;
+	virtual RESULT seekTo(pts_t &pts) = 0;
+	
+	// seekTo ...
 };
 
 class iDVBSectionReader;
+class iDVBTSRecorder;
 class iTSMPEGDecoder;
 
 class iDVBDemux: public iObject
 {
 public:
 	virtual RESULT createSectionReader(eMainloop *context, ePtr<iDVBSectionReader> &reader)=0;
+	virtual RESULT createTSRecorder(ePtr<iDVBTSRecorder> &recorder)=0;
 	virtual RESULT getMPEGDecoder(ePtr<iTSMPEGDecoder> &reader)=0;
+	virtual RESULT getSTC(pts_t &pts)=0;
+	virtual RESULT getCADemuxID(uint8_t &id)=0;
+	virtual RESULT flush()=0;
 };
 
 class iTSMPEGDecoder: public iObject