X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/e677ac4a7bf81391877c909a703e5918ce4a511b..3a3836240d87bc63d4865d56a49fb2113634308b:/lib/service/iservice.h

diff --git a/lib/service/iservice.h b/lib/service/iservice.h
index f699bdb9..4a19378c 100644
--- a/lib/service/iservice.h
+++ b/lib/service/iservice.h
@@ -1,19 +1,12 @@
 #ifndef __lib_dvb_iservice_h
 #define __lib_dvb_iservice_h
 
+#include <lib/python/swig.h>
 #include <lib/base/object.h>
 #include <string>
 #include <connection.h>
 #include <list>
 
-#ifdef SWIG
-#define TEMPLATE_TYPEDEF(x, y) \
-%template(y) x; \
-typedef x y
-#else
-#define TEMPLATE_TYPEDEF(x, y) typedef x y
-#endif
-
 class eServiceReference
 {
 public:
@@ -142,6 +135,8 @@ public:
 	}
 };
 
+typedef unsigned long long pts_t;
+
 	/* the reason we have the servicereference as additional argument is
 	   that we don't have to create one object for every entry in a possibly
 	   large list, provided that no state information is nessesary to deliver
@@ -151,15 +146,24 @@ class iStaticServiceInformation: public iObject
 {
 public:
 	virtual RESULT getName(const eServiceReference &ref, std::string &name)=0;
+	
+		// doesn't need to be implemented, should return -1 then.
+	virtual int getLength(const eServiceReference &ref)=0;
+
+		// FOR SWIG
+	std::string getName(const eServiceReference &ref) { std::string temp; getName(ref, temp); return temp; }
 };
 
 TEMPLATE_TYPEDEF(ePtr<iStaticServiceInformation>, iStaticServiceInformationPtr);
 
 class eServiceEvent;
 
-class iServiceInformation: public iStaticServiceInformation
+class iServiceInformation: public iObject
 {
 public:
+	virtual RESULT getName(std::string &name)=0;
+		// FOR SWIG
+	std::string getName() { std::string temp; getName(temp); return temp; }
 	virtual RESULT getEvent(ePtr<eServiceEvent> &evt, int nownext);
 };
 
@@ -174,6 +178,16 @@ public:
 
 TEMPLATE_TYPEDEF(ePtr<iPauseableService>, iPauseableServicePtr);
 
+class iSeekableService: public iObject
+{
+public:
+	virtual RESULT getLength(pts_t &SWIG_OUTPUT)=0;
+	virtual RESULT seekTo(pts_t to)=0;
+	virtual RESULT getPlayPosition(pts_t &SWIG_OUTPUT)=0;
+};
+
+TEMPLATE_TYPEDEF(ePtr<iSeekableService>, iSeekableServicePtr);
+
 class iPlayableService: public iObject
 {
 	friend class iServiceHandler;
@@ -184,11 +198,12 @@ public:
 		evEnd,
 		
 		// when iServiceInformation is implemented:
-		evNewEvent
+		evUpdatedEventInfo
 	};
 	virtual RESULT connectEvent(const Slot2<void,iPlayableService*,int> &event, ePtr<eConnection> &connection)=0;
 	virtual RESULT start()=0;
 	virtual RESULT stop()=0;
+	virtual RESULT seek(ePtr<iSeekableService> &ptr)=0;
 	virtual RESULT pause(ePtr<iPauseableService> &ptr)=0;
 	virtual RESULT info(ePtr<iServiceInformation> &ptr)=0;
 };
@@ -198,6 +213,7 @@ TEMPLATE_TYPEDEF(ePtr<iPlayableService>, iPlayableServicePtr);
 class iRecordableService: public iObject
 {
 public:
+	virtual RESULT prepare()=0;
 	virtual RESULT start()=0;
 	virtual RESULT stop()=0;
 };
@@ -209,7 +225,11 @@ TEMPLATE_TYPEDEF(ePtr<iRecordableService>, iRecordableServicePtr);
 class iListableService: public iObject
 {
 public:
+		/* legacy interface: get a list */
 	virtual RESULT getContent(std::list<eServiceReference> &list)=0;
+	
+		/* new, shiny interface: streaming. */
+	virtual RESULT getNext(eServiceReference &ptr)=0;
 };
 
 TEMPLATE_TYPEDEF(ePtr<iListableService>, iListableServicePtr);