- add "getCurrent" to service listbox

[enigma2.git] / lib / service / iservice.h

diff --git a/lib/service/iservice.h b/lib/service/iservice.h
index a636957474bdacabf62280ead832483503917ffa..5a8a0627fa1ba913e142a4338f73aebfcb2324ff 100644 (file)
--- a/lib/service/iservice.h
+++ b/lib/service/iservice.h
@@ -6,6 +6,14 @@
 #include <connection.h>
 #include <list>
 
 #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:
 class eServiceReference
 {
 public:


@@ -134,13 +142,26 @@ public:
        }
 };
 
        }
 };
 

-class iServiceInformation: public iObject
+       /* 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;
+};
+
+TEMPLATE_TYPEDEF(ePtr<iStaticServiceInformation>, iStaticServiceInformationPtr);
+
+class iServiceInformation: public iStaticServiceInformation

 {
 public:
 {
 public:

-       virtual RESULT getName(std::string &name)=0;
+       

 };
 
 };
 

-typedef ePtr<iServiceInformation> iServiceInformationPtr;
+TEMPLATE_TYPEDEF(ePtr<iServiceInformation>, iServiceInformationPtr);

 
 class iPauseableService: public iObject
 {
 
 class iPauseableService: public iObject
 {


@@ -149,7 +170,7 @@ public:
        virtual RESULT unpause()=0;
 };
 
        virtual RESULT unpause()=0;
 };
 

-typedef ePtr<iPauseableService> iPauseableServicePtr;
+TEMPLATE_TYPEDEF(ePtr<iPauseableService>, iPauseableServicePtr);

 
 class iPlayableService: public iObject
 {
 
 class iPlayableService: public iObject
 {


@@ -163,11 +184,11 @@ public:
        virtual RESULT connectEvent(const Slot2<void,iPlayableService*,int> &event, ePtr<eConnection> &connection)=0;
        virtual RESULT start()=0;
        virtual RESULT stop()=0;
        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
 {
 
 class iRecordableService: public iObject
 {


@@ -176,7 +197,9 @@ public:
        virtual RESULT stop()=0;
 };
 
        virtual RESULT stop()=0;
 };
 

-typedef ePtr<iRecordableService> iRecordableServicePtr;
+TEMPLATE_TYPEDEF(ePtr<iRecordableService>, iRecordableServicePtr);
+
+// TEMPLATE_TYPEDEF(std::list<eServiceReference>, eServiceReferenceList);

 
 class iListableService: public iObject
 {
 
 class iListableService: public iObject
 {


@@ -184,7 +207,7 @@ public:
        virtual RESULT getContent(std::list<eServiceReference> &list)=0;
 };
 
        virtual RESULT getContent(std::list<eServiceReference> &list)=0;
 };
 

-typedef ePtr<iListableService> iListableServicePtr;
+TEMPLATE_TYPEDEF(ePtr<iListableService>, iListableServicePtr);

 
 class iServiceHandler: public iObject
 {
 
 class iServiceHandler: public iObject
 {


@@ -192,8 +215,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 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
 
 #endif