X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/68b90d5fc4598225d38579634686a3a16083fa69..462ec6f4ad2051551cb91c75ba614d3b7b17c543:/lib/dvb/idvb.h

diff --git a/lib/dvb/idvb.h b/lib/dvb/idvb.h
index ad5da21e..5b6f19fc 100644
--- a/lib/dvb/idvb.h
+++ b/lib/dvb/idvb.h
@@ -19,7 +19,7 @@
 struct eBouquet
 {
 	std::string m_bouquet_name;
-	std::string m_path;
+	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
@@ -153,6 +153,12 @@ struct eServiceReferenceDVB: public eServiceReference
 	eDVBNamespace getDVBNamespace() const { return eDVBNamespace(data[4]); }
 	void setDVBNamespace(eDVBNamespace dvbnamespace) { data[4]=dvbnamespace.get(); }
 
+	eServiceID getParentServiceID() const { return eServiceID(data[5]); }
+	void setParentServiceID( eServiceID sid ) { data[5]=sid.get(); }
+
+	eTransportStreamID getParentTransportStreamID() const { return eTransportStreamID(data[6]); }
+	void setParentTransportStreamID( eTransportStreamID tsid ) { data[6]=tsid.get(); }
+
 	eServiceReferenceDVB(eDVBNamespace dvbnamespace, eTransportStreamID transport_stream_id, eOriginalNetworkID original_network_id, eServiceID service_id, int service_type)
 		:eServiceReference(eServiceReference::idDVB, 0)
 	{
@@ -179,6 +185,11 @@ struct eServiceReferenceDVB: public eServiceReference
 		:eServiceReference(eServiceReference::idDVB, 0)
 	{
 	}
+
+	eServiceReferenceDVB(const std::string &string)
+		:eServiceReference(string)
+	{
+	}
 };
 
 
@@ -218,8 +229,9 @@ public:
 	
 	// iStaticServiceInformation
 	RESULT getName(const eServiceReference &ref, std::string &name);
-	int getLength(const eServiceReference &ref);
-	
+	RESULT getEvent(const eServiceReference &ref, ePtr<eServiceEvent> &ptr, time_t start_time);
+	bool isPlayable(const eServiceReference &ref, const eServiceReference &ignore);
+
 		/* for filtering: */
 	int checkFilter(const eServiceReferenceDVB &ref, const eDVBChannelQuery &query);
 };
@@ -279,6 +291,7 @@ public:
 	
 	virtual RESULT addService(const eServiceReferenceDVB &service, 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;
 
@@ -335,24 +348,32 @@ 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;
 	virtual RESULT sendToneburst(int burst)=0;
 	virtual RESULT setSEC(iDVBSatelliteEquipmentControl *sec)=0;
 	virtual RESULT setSecSequence(const eSecCommandList &list)=0;
+
+	enum {
+		bitErrorRate, signalPower, signalQuality
+	};
+	virtual int readFrontendData(int type)=0;
+
 	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(const eDVBChannelID &chid)=0;
+	virtual int isCompatibleWith(ePtr<iDVBFrontendParameters> &feparm)=0;
 };
 
 class iDVBSatelliteEquipmentControl: public iObject
 {
 public:
-	virtual RESULT prepare(iDVBFrontend &frontend, FRONTENDPARAMETERS &parm, eDVBFrontendParametersSatellite &sat)=0;
+	virtual RESULT prepare(iDVBFrontend &frontend, FRONTENDPARAMETERS &parm, eDVBFrontendParametersSatellite &sat, int frontend_id)=0;
+	virtual int canTune(const eDVBFrontendParametersSatellite &feparm, iDVBFrontend *fe, int frontend_id)=0;
+	virtual void setRotorMoving(bool)=0;
 };
 
 struct eDVBCIRouting
@@ -372,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 */
@@ -408,9 +435,14 @@ public:
 	virtual RESULT playFile(const char *file) = 0;
 	
 	virtual RESULT getLength(pts_t &pts) = 0;
-	virtual RESULT getCurrentPosition(pts_t &pos) = 0;
-	virtual RESULT seekTo(int relative, pts_t &pts) = 0;
-	virtual RESULT seekToPosition(const off_t &pts) = 0;
+	
+		/* we explicitely ask for the decoding demux here because a channel
+		   can be shared between multiple decoders.
+		   Of couse skipping doesn't make much sense 
+		   then, but getCurrentPosition does. */
+	virtual RESULT getCurrentPosition(iDVBDemux *decoding_demux, pts_t &pos, int mode) = 0;
+	virtual RESULT seekTo(iDVBDemux *decoding_demux, int relative, pts_t &pts) = 0;
+	virtual RESULT seekToPosition(iDVBDemux *decoding_demux, const off_t &pts) = 0;
 };
 
 class iDVBSectionReader;
@@ -423,7 +455,7 @@ 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 getSTC(pts_t &pts, int num=0)=0;
 	virtual RESULT getCADemuxID(uint8_t &id)=0;
 	virtual RESULT flush()=0;
 };
@@ -439,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;
 	
@@ -453,6 +488,9 @@ public:
 		/** Continue after freeze. */
 	virtual RESULT unfreeze()=0;
 	
+		/** fast forward by skipping frames. 0 is disabled, 2 is twice-the-speed, ... */
+	virtual RESULT setFastForward(int skip=0)=0;
+	
 		// stop on .. Picture
 	enum { spm_I, spm_Ref, spm_Any };
 		/** Stop on specific decoded picture. For I-Frame display. */
@@ -468,6 +506,8 @@ public:
 	enum { zoom_Normal, zoom_PanScan, zoom_Letterbox, zoom_Fullscreen };
 		/** Set Zoom. mode *must* be fitting. */
 	virtual RESULT setZoom(int what)=0;
+	
+	virtual RESULT setTrickmode(int what) = 0;
 };
 
 #endif