remove non working indication of playable services in servicelist

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

diff --git a/lib/service/iservice.h b/lib/service/iservice.h
index f9a26722bf7d57125a687401651309565c95fb82..ab95ef79abe49e58c719f453e4cf68ee82ce3d89 100644 (file)
--- a/lib/service/iservice.h
+++ b/lib/service/iservice.h
@@ -3,6 +3,7 @@
 
 #include <lib/python/swig.h>
 #include <lib/base/object.h>
+#include <lib/service/event.h>
 #include <string>
 #include <connection.h>
 #include <list>
@@ -43,10 +44,12 @@ public:
 
        int data[8];
        std::string path;
+       std::string getPath() { return path; }
 
 // only for override service names in bouquets or to give servicerefs a name which not have a
 // real existing service ( for dvb eServiceDVB )
        std::string name;
+       std::string getName() { return name; }
 
        eServiceReference()
                : type(idInvalid), flags(0)
@@ -109,7 +112,7 @@ public:
        {
                if (type != c.type)
                        return 0;
-               return /* (flags == c.flags) && */ (memcmp(data, c.data, sizeof(int)*8)==0) && (path == c.path);
+               return (memcmp(data, c.data, sizeof(int)*8)==0) && (path == c.path);
        }
        bool operator!=(const eServiceReference &c) const
        {
@@ -122,11 +125,6 @@ public:
 
                if (type > c.type)
                        return 0;
-                       
-/*             if (flags < c.flags)
-                       return 1;
-               if (flags > c.flags)
-                       return 0; */
 
                int r=memcmp(data, c.data, sizeof(int)*8);
                if (r)
@@ -146,7 +144,7 @@ public:
 
 SWIG_ALLOW_OUTPUT_SIMPLE(eServiceReference);
 
-typedef unsigned long long pts_t;
+typedef 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
@@ -175,7 +173,8 @@ 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)=0;
+       virtual int getLength(const eServiceReference &ref);
+       virtual SWIG_VOID(RESULT) getEvent(const eServiceReference &ref, ePtr<eServiceEvent> &SWIG_OUTPUT);
 };
 
 TEMPLATE_TYPEDEF(ePtr<iStaticServiceInformation>, iStaticServiceInformationPtr);
@@ -189,6 +188,36 @@ class iServiceInformation: public iObject
 public:
        virtual SWIG_VOID(RESULT) getName(std::string &SWIG_OUTPUT)=0;
        virtual SWIG_VOID(RESULT) getEvent(ePtr<eServiceEvent> &SWIG_OUTPUT, int nownext);
+
+       enum { 
+               sIsCrypted,  /* is encrypted (no indication if decrypt was possible) */
+               sAspect,     /* aspect ratio: 0=4:3, 1=16:9, 2=whatever we need */
+               sIsMultichannel, /* multichannel *available* (probably not selected) */
+               
+                       /* "user serviceable info" - they are not reliable. Don't use them for anything except the service menu!
+                          that's also the reason why they are so globally defined. 
+                          
+                          
+                          again - if somebody EVER tries to use this information for anything else than simply displaying it,
+                          i will change this to return a user-readable text like "zero x zero three three" (and change the
+                          exact spelling in every version) to stop that!
+                       */
+               sVideoPID,
+               sAudioPID,
+               sPCRPID,
+               sPMTPID,
+               sTXTPID,
+               
+               sSID,
+               sONID,
+               sTSID,
+               sNamespace,
+               sProvider,
+       };
+       enum { resNA = -1, resIsString = -2 };
+
+       virtual int getInfo(int w);
+       virtual std::string getInfoString(int w);
 };
 
 TEMPLATE_TYPEDEF(ePtr<iServiceInformation>, iServiceInformationPtr);
@@ -207,11 +236,35 @@ class iSeekableService: public iObject
 public:
        virtual RESULT getLength(pts_t &SWIG_OUTPUT)=0;
        virtual RESULT seekTo(pts_t to)=0;
+       enum { dirForward = +1, dirBackward = -1 };
+       virtual RESULT seekRelative(int direction, pts_t to)=0;
        virtual RESULT getPlayPosition(pts_t &SWIG_OUTPUT)=0;
 };
 
 TEMPLATE_TYPEDEF(ePtr<iSeekableService>, iSeekableServicePtr);
 
+struct iAudioTrackInfo
+{
+       std::string m_description;
+       std::string m_language; /* iso639 */
+       
+       std::string getDescription() { return m_description; }
+       std::string getLanguage() { return m_language; }
+};
+
+SWIG_ALLOW_OUTPUT_SIMPLE(iAudioTrackInfo);
+
+class iAudioTrackSelection: public iObject
+{
+public:
+       virtual int getNumberOfTracks()=0;
+       virtual RESULT selectTrack(unsigned int i)=0;
+       virtual SWIG_VOID(RESULT) getTrackInfo(struct iAudioTrackInfo &SWIG_OUTPUT, unsigned int n)=0;
+};
+
+TEMPLATE_TYPEDEF(ePtr<iAudioTrackSelection>, iAudioTrackSelectionPtr);
+
+
 class iPlayableService: public iObject
 {
        friend class iServiceHandler;
@@ -222,8 +275,9 @@ public:
                evEnd,
                
                evTuneFailed,
-               // when iServiceInformation is implemented:
-               evUpdatedEventInfo
+                       // when iServiceInformation is implemented:
+               evUpdatedEventInfo,
+               evUpdatedInfo,
        };
        virtual RESULT connectEvent(const Slot2<void,iPlayableService*,int> &event, ePtr<eConnection> &connection)=0;
        virtual RESULT start()=0;
@@ -231,6 +285,7 @@ public:
        virtual SWIG_VOID(RESULT) seek(ePtr<iSeekableService> &SWIG_OUTPUT)=0;
        virtual SWIG_VOID(RESULT) pause(ePtr<iPauseableService> &SWIG_OUTPUT)=0;
        virtual SWIG_VOID(RESULT) info(ePtr<iServiceInformation> &SWIG_OUTPUT)=0;
+       virtual SWIG_VOID(RESULT) audioTracks(ePtr<iAudioTrackSelection> &SWIG_OUTPUT)=0;
 };
 
 TEMPLATE_TYPEDEF(ePtr<iPlayableService>, iPlayableServicePtr);
@@ -247,6 +302,22 @@ TEMPLATE_TYPEDEF(ePtr<iRecordableService>, iRecordableServicePtr);
 
 // TEMPLATE_TYPEDEF(std::list<eServiceReference>, eServiceReferenceList);
 
+class iMutableServiceList: public iObject
+{
+public:
+               /* flush changes */
+       virtual RESULT flushChanges()=0;
+               /* adds a service to a list */
+       virtual RESULT addService(eServiceReference &ref)=0;
+               /* removes a service from a list */
+       virtual RESULT removeService(eServiceReference &ref)=0;
+               /* moves a service in a list, only if list suppports a specific sort method. */
+               /* pos is the new, absolute position from 0..size-1 */
+       virtual RESULT moveService(eServiceReference &ref, int pos)=0;
+};
+
+TEMPLATE_TYPEDEF(ePtr<iMutableServiceList>, iMutableServiceListPtr);
+
 class iListableService: public iObject
 {
 public:
@@ -262,6 +333,8 @@ public:
                   (as well as a future "active" extension) won't be possible.
                */
        virtual int compareLessEqual(const eServiceReference &, const eServiceReference &)=0;
+       
+       virtual SWIG_VOID(RESULT) startEdit(ePtr<iMutableServiceList> &SWIG_OUTPUT)=0;
 };
 
 TEMPLATE_TYPEDEF(ePtr<iListableService>, iListableServicePtr);
@@ -290,6 +363,8 @@ public:
                // TODO: additional stuff, like a conversion interface?
 };
 
+TEMPLATE_TYPEDEF(ePtr<iServiceOfflineOperations>, iServiceOfflineOperationsPtr);
+
 class iServiceHandler: public iObject
 {
 public: