X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/ddc3964ed95d01e72229dc9af968a327cd84e56c..defa1a765f48ec880b36b14a247b89649553c2ec:/lib/service/iservice.h

diff --git a/lib/service/iservice.h b/lib/service/iservice.h
index a6369574..7e24f9c1 100644
--- a/lib/service/iservice.h
+++ b/lib/service/iservice.h
@@ -134,13 +134,34 @@ public:
 	}
 };
 
+	/* 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
+	   the required information. Anyway - ref *must* be the same as the argument
+	   to the info() or getIServiceInformation call! */
+class iStaticServiceInformation: public iObject
+{
+public:
+	virtual RESULT getName(const eServiceReference &ref, std::string &name)=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 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);
 };
 
-typedef ePtr<iServiceInformation> iServiceInformationPtr;
+TEMPLATE_TYPEDEF(ePtr<iServiceInformation>, iServiceInformationPtr);
 
 class iPauseableService: public iObject
 {
@@ -149,7 +170,7 @@ public:
 	virtual RESULT unpause()=0;
 };
 
-typedef ePtr<iPauseableService> iPauseableServicePtr;
+TEMPLATE_TYPEDEF(ePtr<iPauseableService>, iPauseableServicePtr);
 
 class iPlayableService: public iObject
 {
@@ -158,33 +179,43 @@ public:
 	enum
 	{
 		evStart,
-		evEnd
+		evEnd,
+		
+		// when iServiceInformation is implemented:
+		evUpdatedEventInfo
 	};
 	virtual RESULT connectEvent(const Slot2<void,iPlayableService*,int> &event, ePtr<eConnection> &connection)=0;
 	virtual RESULT start()=0;
 	virtual RESULT stop()=0;
-	virtual RESULT getIPausableService(ePtr<iPauseableService> &ptr)=0;
-	virtual RESULT getIServiceInformation(ePtr<iServiceInformation> &ptr)=0;
+	virtual RESULT pause(ePtr<iPauseableService> &ptr)=0;
+	virtual RESULT info(ePtr<iServiceInformation> &ptr)=0;
 };
 
-typedef ePtr<iPlayableService> iPlayableServicePtr;
+TEMPLATE_TYPEDEF(ePtr<iPlayableService>, iPlayableServicePtr);
 
 class iRecordableService: public iObject
 {
 public:
+	virtual RESULT prepare()=0;
 	virtual RESULT start()=0;
 	virtual RESULT stop()=0;
 };
 
-typedef ePtr<iRecordableService> iRecordableServicePtr;
+TEMPLATE_TYPEDEF(ePtr<iRecordableService>, iRecordableServicePtr);
+
+// TEMPLATE_TYPEDEF(std::list<eServiceReference>, eServiceReferenceList);
 
 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;
 };
 
-typedef ePtr<iListableService> iListableServicePtr;
+TEMPLATE_TYPEDEF(ePtr<iListableService>, iListableServicePtr);
 
 class iServiceHandler: public iObject
 {
@@ -192,8 +223,9 @@ public:
 	virtual RESULT play(const eServiceReference &, ePtr<iPlayableService> &ptr)=0;
 	virtual RESULT record(const eServiceReference &, ePtr<iRecordableService> &ptr)=0;
 	virtual RESULT list(const eServiceReference &, ePtr<iListableService> &ptr)=0;
+	virtual RESULT info(const eServiceReference &, ePtr<iStaticServiceInformation> &ptr);
 };
 
-typedef ePtr<iServiceHandler> iServiceHandlerPtr;
+TEMPLATE_TYPEDEF(ePtr<iServiceHandler>, iServiceHandlerPtr);
 
 #endif