X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/740ae9b4a03c13901e4f4ffc008e4c0cfd63d896..7a0e4749e8bf580370bd23d9b450763d9e917909:/lib/service/iservice.h

diff --git a/lib/service/iservice.h b/lib/service/iservice.h
index 378bdcc9..5a5a6cee 100644
--- a/lib/service/iservice.h
+++ b/lib/service/iservice.h
@@ -22,7 +22,6 @@ public:
 	};
 	int type;
 
-	int flags; // flags will NOT be compared.
 	enum
 	{
 		isDirectory=1,		// SHOULD enter  (implies mustDescent)
@@ -40,12 +39,16 @@ public:
 		hasSortKey=16,		// has a sort key in data[3]. not having a sort key implies 0.
 		sort1=32					// sort key is 1 instead of 0
 	};
+	int flags; // flags will NOT be compared.
 
 	inline int getSortKey() const { return (flags & hasSortKey) ? data[3] : ((flags & sort1) ? 1 : 0); }
 
+#ifndef SWIG
 	int data[8];
 	std::string path;
+#endif
 	std::string getPath() { return path; }
+	void setPath( const std::string &n ) { path=n; }
 
 	int getData(unsigned int num) const
 	{
@@ -62,9 +65,10 @@ public:
 
 // only for override service names in bouquets or to give servicerefs a name which not have a
 // real existing service ( for dvb eServiceDVB )
+#ifndef SWIG
 	std::string name;
+#endif
 	std::string getName() { return name; }
-
 	void setName( const std::string &n ) { name=n; }
 
 	eServiceReference()
@@ -72,6 +76,7 @@ public:
 	{
 		memset(data, 0, sizeof(data));
 	}
+#ifndef SWIG
 	eServiceReference(int type, int flags)
 		: type(type), flags(flags)
 	{
@@ -122,6 +127,7 @@ public:
 	{
 		memset(data, 0, sizeof(data));
 	}
+#endif
 	eServiceReference(const std::string &string);
 	std::string toString() const;
 	bool operator==(const eServiceReference &c) const
@@ -185,12 +191,16 @@ typedef long long pts_t;
 	   
 class iStaticServiceInformation: public iObject
 {
+#ifdef SWIG
+	iStaticServiceInformation();
+	~iStaticServiceInformation();
+#endif
 public:
 	virtual SWIG_VOID(RESULT) getName(const eServiceReference &ref, std::string &SWIG_OUTPUT)=0;
 	
 		// doesn't need to be implemented, should return -1 then.
 	virtual int getLength(const eServiceReference &ref);
-	virtual SWIG_VOID(RESULT) getEvent(const eServiceReference &ref, ePtr<eServiceEvent> &SWIG_OUTPUT, time_t start_time=0);
+	virtual SWIG_VOID(RESULT) getEvent(const eServiceReference &ref, ePtr<eServiceEvent> &SWIG_OUTPUT, time_t start_time=-1);
 		// returns true when not implemented
 	virtual bool isPlayable(const eServiceReference &ref, const eServiceReference &ignore);
 
@@ -204,6 +214,10 @@ TEMPLATE_TYPEDEF(ePtr<eServiceEvent>, eServiceEventPtr);
 
 class iServiceInformation: public iObject
 {
+#ifdef SWIG
+	iServiceInformation();
+	~iServiceInformation();
+#endif
 public:
 	virtual SWIG_VOID(RESULT) getName(std::string &SWIG_OUTPUT)=0;
 	virtual SWIG_VOID(RESULT) getEvent(ePtr<eServiceEvent> &SWIG_OUTPUT, int nownext);
@@ -246,6 +260,10 @@ TEMPLATE_TYPEDEF(ePtr<iServiceInformation>, iServiceInformationPtr);
 
 class iFrontendStatusInformation: public iObject
 {
+#ifdef SWIG
+	iFrontendStatusInformation();
+	~iFrontendStatusInformation();
+#endif
 public:
 	enum {
 		bitErrorRate,
@@ -259,6 +277,10 @@ TEMPLATE_TYPEDEF(ePtr<iFrontendStatusInformation>, iFrontendStatusInformationPtr
 
 class iPauseableService: public iObject
 {
+#ifdef SWIG
+	iPausableService();
+	~iPausableService();
+#endif
 public:
 	virtual RESULT pause()=0;
 	virtual RESULT unpause()=0;
@@ -272,6 +294,10 @@ TEMPLATE_TYPEDEF(ePtr<iPauseableService>, iPauseableServicePtr);
 
 class iSeekableService: public iObject
 {
+#ifdef SWIG
+	iSeekableService();
+	~iSeekableService();
+#endif
 public:
 	virtual RESULT getLength(pts_t &SWIG_OUTPUT)=0;
 	virtual RESULT seekTo(pts_t to)=0;
@@ -287,9 +313,16 @@ TEMPLATE_TYPEDEF(ePtr<iSeekableService>, iSeekableServicePtr);
 
 struct iAudioTrackInfo
 {
+#ifdef SWIG
+private:
+	iAudioTrackInfo();
+	~iAudioTrackInfo();
+public:
+#endif
+#ifndef SWIG
 	std::string m_description;
 	std::string m_language; /* iso639 */
-	
+#endif
 	std::string getDescription() { return m_description; }
 	std::string getLanguage() { return m_language; }
 };
@@ -298,6 +331,10 @@ SWIG_ALLOW_OUTPUT_SIMPLE(iAudioTrackInfo);
 
 class iAudioTrackSelection: public iObject
 {
+#ifdef SWIG
+	iAudioTrackSelection();
+	~iAudioTrackSelection();
+#endif
 public:
 	virtual int getNumberOfTracks()=0;
 	virtual RESULT selectTrack(unsigned int i)=0;
@@ -308,6 +345,10 @@ TEMPLATE_TYPEDEF(ePtr<iAudioTrackSelection>, iAudioTrackSelectionPtr);
 
 class iSubserviceList: public iObject
 {
+#ifdef SWIG
+	iSubserviceList();
+	~iSubserviceList();
+#endif
 public:
 	virtual int getNumberOfSubservices()=0;
 	virtual SWIG_VOID(RESULT) getSubservice(eServiceReference &SWIG_OUTPUT, unsigned int n)=0;
@@ -317,6 +358,10 @@ TEMPLATE_TYPEDEF(ePtr<iSubserviceList>, iSubserviceListPtr);
 
 class iTimeshiftService: public iObject
 {
+#ifdef SWIG
+	iTimeshiftService();
+	~iTimeshiftService();
+#endif
 public:
 	virtual RESULT startTimeshift()=0;
 	virtual RESULT stopTimeshift()=0;
@@ -326,6 +371,10 @@ TEMPLATE_TYPEDEF(ePtr<iTimeshiftService>, iTimeshiftServicePtr);
 
 class iPlayableService: public iObject
 {
+#ifdef SWIG
+	iPlayableService();
+	~iPlaybleService();
+#endif
 	friend class iServiceHandler;
 public:
 	enum
@@ -337,6 +386,8 @@ public:
 			// when iServiceInformation is implemented:
 		evUpdatedEventInfo,
 		evUpdatedInfo,
+		
+		evEOF
 	};
 	virtual RESULT connectEvent(const Slot2<void,iPlayableService*,int> &event, ePtr<eConnection> &connection)=0;
 	virtual RESULT start()=0;
@@ -354,6 +405,10 @@ TEMPLATE_TYPEDEF(ePtr<iPlayableService>, iPlayableServicePtr);
 
 class iRecordableService: public iObject
 {
+#ifdef SWIG
+	iRecordableService();
+	~iRecordableService();
+#endif
 public:
 	virtual RESULT prepare(const char *filename)=0;
 	virtual RESULT start()=0;
@@ -366,6 +421,10 @@ TEMPLATE_TYPEDEF(ePtr<iRecordableService>, iRecordableServicePtr);
 
 class iMutableServiceList: public iObject
 {
+#ifdef SWIG
+	iMutableServiceList();
+	~iMutableServiceList();
+#endif
 public:
 		/* flush changes */
 	virtual RESULT flushChanges()=0;
@@ -382,6 +441,10 @@ TEMPLATE_TYPEDEF(ePtr<iMutableServiceList>, iMutableServiceListPtr);
 
 class iListableService: public iObject
 {
+#ifdef SWIG
+	iListableService();
+	~iListableService();
+#endif
 public:
 		/* legacy interface: get a list */
 	virtual RESULT getContent(std::list<eServiceReference> &list)=0;
@@ -401,6 +464,7 @@ public:
 
 TEMPLATE_TYPEDEF(ePtr<iListableService>, iListableServicePtr);
 
+#ifndef SWIG
 	/* a helper class which can be used as argument to stl's sort(). */
 class iListableServiceCompare
 {
@@ -412,9 +476,14 @@ public:
 		return m_list->compareLessEqual(a, b);
 	}
 };
+#endif
 
 class iServiceOfflineOperations: public iObject
 {
+#ifdef SWIG
+	iServiceOfflineOperations();
+	~iServiceOfflineOperations();
+#endif
 public:
 		/* to delete a service, forever. */
 	virtual RESULT deleteFromDisk(int simulate=1)=0;
@@ -429,6 +498,10 @@ TEMPLATE_TYPEDEF(ePtr<iServiceOfflineOperations>, iServiceOfflineOperationsPtr);
 
 class iServiceHandler: public iObject
 {
+#ifdef SWIG
+	iServiceHandler();
+	~iServiceHandler();
+#endif
 public:
 	virtual SWIG_VOID(RESULT) play(const eServiceReference &, ePtr<iPlayableService> &SWIG_OUTPUT)=0;
 	virtual SWIG_VOID(RESULT) record(const eServiceReference &, ePtr<iRecordableService> &SWIG_OUTPUT)=0;