X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/03379b6e86edfcce851da2d11c3189d1b7843afb..75b5dff4878843dec6913364bc044ab25c3b78a2:/lib/dvb/idvb.h

diff --git a/lib/dvb/idvb.h b/lib/dvb/idvb.h
index 2c80a9b8..7ee50e8d 100644
--- a/lib/dvb/idvb.h
+++ b/lib/dvb/idvb.h
@@ -8,6 +8,7 @@
 #define FRONTENDPARAMETERS FrontendParameters
 #else
 #include <linux/dvb/frontend.h>
+#include <linux/dvb/video.h>
 #define FRONTENDPARAMETERS struct dvb_frontend_parameters
 #endif
 #include <lib/dvb/frontendparms.h>
@@ -34,7 +35,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);
@@ -235,7 +236,8 @@ public:
 	enum cacheID
 	{
 		cVPID, cAPID, cTPID, cPCRPID, cAC3PID,
-		cVTYPE, cACHANNEL, cAC3DELAY, cPCMDELAY, cacheMax
+		cVTYPE, cACHANNEL, cAC3DELAY, cPCMDELAY,
+		cSUBTITLE, cacheMax
 	};
 
 	int getCacheEntry(cacheID);
@@ -271,7 +273,7 @@ public:
 	// iStaticServiceInformation
 	RESULT getName(const eServiceReference &ref, std::string &name);
 	RESULT getEvent(const eServiceReference &ref, ePtr<eServiceEvent> &ptr, time_t start_time);
-	bool isPlayable(const eServiceReference &ref, const eServiceReference &ignore);
+	int isPlayable(const eServiceReference &ref, const eServiceReference &ignore);
 
 		/* for filtering: */
 	int checkFilter(const eServiceReferenceDVB &ref, const eDVBChannelQuery &query);
@@ -362,7 +364,7 @@ public:
 	virtual RESULT getDVBC(eDVBFrontendParametersCable &SWIG_OUTPUT) const = 0;
 	virtual RESULT getDVBT(eDVBFrontendParametersTerrestrial &SWIG_OUTPUT) const = 0;
 	
-	virtual RESULT calculateDifference(const iDVBFrontendParameters *parm, int &SWIG_OUTPUT) const = 0;
+	virtual RESULT calculateDifference(const iDVBFrontendParameters *parm, int &SWIG_OUTPUT, bool exact) const = 0;
 	virtual RESULT getHash(unsigned long &SWIG_OUTPUT) const = 0;
 };
 
@@ -645,6 +647,16 @@ public:
 	virtual RESULT showSinglePic(const char *filename) = 0;
 
 	virtual RESULT setRadioPic(const std::string &filename) = 0;
+
+	struct videoEvent
+	{
+		enum { eventUnknown = 0, eventSizeChanged = VIDEO_EVENT_SIZE_CHANGED } type;
+		unsigned char aspect;
+		unsigned short height;
+		unsigned short width;
+	};
+
+	virtual RESULT connectVideoEvent(const Slot1<void, struct videoEvent> &event, ePtr<eConnection> &connection) = 0;
 };
 
 #endif //SWIG