- fixed dvb scan

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

diff --git a/lib/service/iservice.h b/lib/service/iservice.h
index a636957474bdacabf62280ead832483503917ffa..01c61fcc77947d364e8310f64feafa119781fed4 100644 (file)
--- a/lib/service/iservice.h
+++ b/lib/service/iservice.h
@@ -6,6 +6,14 @@
 #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:
@@ -134,10 +142,15 @@ 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 iServiceInformation: public iObject
 {
 public:
-       virtual RESULT getName(std::string &name)=0;
+       virtual RESULT getName(const eServiceReference &ref, std::string &name)=0;
 };
 
 typedef ePtr<iServiceInformation> iServiceInformationPtr;
@@ -167,7 +180,7 @@ public:
        virtual RESULT getIServiceInformation(ePtr<iServiceInformation> &ptr)=0;
 };
 
-typedef ePtr<iPlayableService> iPlayableServicePtr;
+TEMPLATE_TYPEDEF(ePtr<iPlayableService>, iPlayableServicePtr);
 
 class iRecordableService: public iObject
 {
@@ -178,13 +191,16 @@ public:
 
 typedef ePtr<iRecordableService> iRecordableServicePtr;
 
+// TEMPLATE_TYPEDEF(std::list<eServiceReference>, eServiceReferenceList);
+typedef std::list<eServiceReference> eServiceReferenceList;
+
 class iListableService: public iObject
 {
 public:
        virtual RESULT getContent(std::list<eServiceReference> &list)=0;
 };
 
-typedef ePtr<iListableService> iListableServicePtr;
+TEMPLATE_TYPEDEF(ePtr<iListableService>, iListableServicePtr);
 
 class iServiceHandler: public iObject
 {
@@ -192,6 +208,7 @@ 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<iServiceInformation> &ptr);
 };
 
 typedef ePtr<iServiceHandler> iServiceHandlerPtr;