X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/7427772dbd7bd10ad6d59801f4628552f5eac6ab..8d162c6432e74a8f2a2982a017b8af528223c8e7:/lib/dvb/idvb.h

diff --git a/lib/dvb/idvb.h b/lib/dvb/idvb.h
index c6cf20eb..699474d3 100644
--- a/lib/dvb/idvb.h
+++ b/lib/dvb/idvb.h
@@ -29,7 +29,16 @@ struct eBouquet
 	RESULT moveService(const eServiceReference &, unsigned int);
 };
 
-		// bitte KEINE operator int() definieren, sonst bringt das ganze nix!
+		/* these structures have by intention no operator int() defined.
+		   the reason of these structures is to avoid mixing for example
+		   a onid and a tsid (as there's no general order for them).
+		   
+		   defining an operator int() would implicitely convert values
+		   between them over the constructor with the int argument.
+		   
+		   'explicit' doesn't here - eTransportStreamID(eOriginalNetworkID(n)) 
+		   would still work. */
+
 struct eTransportStreamID
 {
 private:
@@ -198,6 +207,8 @@ public:
 	std::string m_service_name, m_service_name_sort;
 	std::string m_provider_name;
 	
+	void genSortName();
+	
 	int m_flags;
 	std::set<int> m_ca;
 	std::map<int,int> m_cache;
@@ -268,6 +279,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,13 +347,14 @@ public:
 	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;
 };
 
 struct eDVBCIRouting
@@ -397,9 +410,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) = 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;